diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-14 17:44:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-16 16:14:50 -0700 |
| commit | 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53 (patch) | |
| tree | aba31f1d671b4816fb63fca00b985ab0d2b6a12b /build/Android.common.mk | |
| parent | de1129a26e0474ea8bb9112938ebb867163969fd (diff) | |
| download | art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.zip art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.gz art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.bz2 | |
Add ISA directory to image and odex pathnames.
Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index cc600bd..5341136 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -136,12 +136,12 @@ endif ART_DALVIK_CACHE_DIR := /data/dalvik-cache # directory used for gtests on device -ART_BASE_NATIVETEST_DIR := /data/nativetest/art -ART_BASE_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art +ART_NATIVETEST_DIR := /data/nativetest/art +ART_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art -# directory used for tests on device -ART_BASE_TEST_DIR := /data/art-test -ART_BASE_TEST_OUT := $(TARGET_OUT_DATA)/art-test +# directory used for oat tests on device +ART_TEST_DIR := /data/art-test +ART_TEST_OUT := $(TARGET_OUT_DATA)/art-test # Primary vs. secondary 2ND_TARGET_ARCH := $(TARGET_2ND_ARCH) @@ -157,26 +157,15 @@ ifdef TARGET_2ND_ARCH ART_PHONY_TEST_TARGET_SUFFIX := 64 2ND_ART_PHONY_TEST_TARGET_SUFFIX := 32 ART_TARGET_BINARY_SUFFIX := 64 + ART_TARGET_ARCH_32 := $(TARGET_2ND_ARCH) + ART_TARGET_ARCH_64 := $(TARGET_ARCH) else # TODO: ??? $(error Do not know what to do with this multi-target configuration!) endif - # Primary with primary suffix - ART_NATIVETEST_DIR := $(ART_BASE_NATIVETEST_DIR)$(art_test_primary_suffix) - ART_NATIVETEST_OUT := $(ART_BASE_NATIVETEST_OUT)$(art_test_primary_suffix) - ART_TEST_DIR := $(ART_BASE_TEST_DIR)$(art_test_primary_suffix) - ART_TEST_OUT := $(ART_BASE_TEST_OUT)$(art_test_primary_suffix) - # Secondary with 2ND_ prefix and secondary suffix - 2ND_ART_NATIVETEST_DIR := $(ART_BASE_NATIVETEST_DIR)$(art_test_secondary_suffix) - 2ND_ART_NATIVETEST_OUT := $(ART_BASE_NATIVETEST_OUT)$(art_test_secondary_suffix) - 2ND_ART_TEST_DIR := $(ART_BASE_TEST_DIR)$(art_test_secondary_suffix) - 2ND_ART_TEST_OUT := $(ART_BASE_TEST_OUT)$(art_test_secondary_suffix) else - ART_NATIVETEST_DIR := $(ART_BASE_NATIVETEST_DIR) - ART_NATIVETEST_OUT := $(ART_BASE_NATIVETEST_OUT) - ART_TEST_DIR := $(ART_BASE_TEST_DIR) - ART_TEST_OUT := $(ART_BASE_TEST_OUT) - # No secondary + ART_TARGET_ARCH_32 := $(TARGET_ARCH) + ART_TARGET_ARCH_64 := endif ART_CPP_EXTENSION := .cc |