diff options
Diffstat (limited to 'build/Android.common_path.mk')
| -rw-r--r-- | build/Android.common_path.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 8c0d9f29e8..10695b6be7 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -23,7 +23,11 @@ include art/build/Android.common.mk ART_TARGET_DALVIK_CACHE_DIR := /data/dalvik-cache # Directory used for gtests on device. -ART_TARGET_NATIVETEST_DIR := /data/nativetest/art +# $(TARGET_OUT_DATA_NATIVE_TESTS) will evaluate to the nativetest directory in the target part on +# the host, so we can strip everything but the directory to find out whether it is "nativetest" or +# "nativetest64." +ART_TARGET_NATIVETEST_DIR := /data/$(notdir $(TARGET_OUT_DATA_NATIVE_TESTS))/art + ART_TARGET_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art # Directory used for oat tests on device. @@ -31,7 +35,11 @@ ART_TARGET_TEST_DIR := /data/art-test ART_TARGET_TEST_OUT := $(TARGET_OUT_DATA)/art-test # Directory used for temporary test files on the host. +ifneq ($(TMPDIR),) +ART_HOST_TEST_DIR := $(TMPDIR)/test-art-$(shell echo $$PPID) +else ART_HOST_TEST_DIR := /tmp/test-art-$(shell echo $$PPID) +endif # Core.oat location on the device. TARGET_CORE_OAT := $(ART_TARGET_TEST_DIR)/$(DEX2OAT_TARGET_ARCH)/core.oat |