diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-25 18:09:32 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-04-01 13:58:32 -0700 |
| commit | afbaa1aab02cfe519d00336870b1bcd24b61378d (patch) | |
| tree | ec33583d52a42ee49082f4bce404e8c434cfd8f5 /dalvikvm | |
| parent | 8ce67ac16abcd25b376be622cbd20a34aec4a59d (diff) | |
| download | art-afbaa1aab02cfe519d00336870b1bcd24b61378d.zip art-afbaa1aab02cfe519d00336870b1bcd24b61378d.tar.gz art-afbaa1aab02cfe519d00336870b1bcd24b61378d.tar.bz2 | |
Build changes to build multilib tests
Test files will be emitted into directories for both first and second
target architectures. Going with the naming scheme for binaries,
single-architecture and 32b cases have the standard name, and
64b goes into a directory with "64" suffix.
In multi-architecture setups, the default concrete test targets are
extended with a "32" and "64" suffix, e.g., test-art-target-oat-JniTest64.
The suffix-less form is linked to the primary architecture target (usually 64).
That means running combined targets, e.g., test-art-target-oat, will only
test the primary architecture right now.
Fixed target run tests calling the right dalvikvm. Fixed library search
path for tests derived from CommonRuntimeTest.
Missing in this work-in-progress is correct handling of dex2oat for the
secondary architecture. To make it work on 64b, comment out line 101
in build/Android.executable.mk
Change-Id: I3d260994e6efe8b73b56c71994053cc9392943a9
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index a046391..231fba1 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -26,6 +26,9 @@ LOCAL_SRC_FILES := dalvikvm.cc LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := dalvikvm +LOCAL_MODULE_STEM_64 := dalvikvm64 include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) |