diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-17 08:21:54 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-24 16:47:31 -0700 |
| commit | afd9acc30bdd11cdd12d8209eb994cb371c65e33 (patch) | |
| tree | 10ebfa28d992a96422fcf81eb28c98393719e9a6 /dalvikvm | |
| parent | ba778fae99ec3b38d4f98262e6b7072bab0e9de4 (diff) | |
| download | art-afd9acc30bdd11cdd12d8209eb994cb371c65e33.zip art-afd9acc30bdd11cdd12d8209eb994cb371c65e33.tar.gz art-afd9acc30bdd11cdd12d8209eb994cb371c65e33.tar.bz2 | |
Multilib ART host.
Build ART for the host as a multilib project with dalvikvm32 and dalvikvm64
running as 32 or 64-bit repsectfully. Note, currently multilib host builds
are not the default, you make the so by setting BUILD_HOST_64bit=1.
Extend tests to execute in both 32 and 64-bit modes. By default both 32 and
64-bit tests are run, add 32 or 64 to the end of a test name to run it in
purely that flavor.
Given the extra spam, modify oat tests to only generate console output when
the test fails.
Change the test harness so that common commands are run when a test should be
skipped, when it passes or when it fails. Use these commands to generate a
summary of passing, skipped and failing tests. Tests will be skipped if they
are known to be broken or if a test has already failed. Setting the variable
TEST_ART_KEEP_GOING=true will force working tests not to be skipped.
In this change all tests running on the optimizing compiler are marked broken
due to breakages running them in a multilib environment.
Break apart Android.common.mk into its constituent parts, along with other
pieces of reorganization.
Stylistic nit, we refer to make rule targets as targets thereby overloading
the term target. While consistent with make's terminology, its confusing with
the Android notion of target. I've switched to just calling targets rules to
avoid confusion in host tests.
Change-Id: I5190fc3de46800a949fbb06b3f4c258ca89ccde9
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 31fcd17..5d838c0 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -33,7 +33,7 @@ LOCAL_MODULE_STEM_64 := dalvikvm64 include external/libcxx/libcxx.mk include $(BUILD_EXECUTABLE) -# create symlink for the primary version target. +# Create symlink for the primary version target. include $(BUILD_SYSTEM)/executable_prefer_symlink.mk ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) @@ -50,6 +50,13 @@ LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_IS_HOST_MODULE := true +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := dalvikvm32 +LOCAL_MODULE_STEM_64 := dalvikvm64 include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) -ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) + +ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)32 +ifneq ($(HOST_PREFER_32_BIT),true) + ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)64 +endif
\ No newline at end of file |