Follow change to ART_TEST_LIST_*
ART_TEST_LIST_* now contain full paths instead of paths relative
to $(OUT_DIR).
Test: m checkbuild
Change-Id: Id4d8610bfd93eb0b9080e83f05b878aedab0967e
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 36c240e..7f38c77 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -480,7 +480,7 @@
# Define a make rule for a target device gtest.
# $(1): gtest name - the name of the test we're building such as leb128_test.
-# $(2): path relative to $OUT to the test binary
+# $(2): path to the test binary
# $(3): 2ND_ or undefined - used to differentiate between the primary and secondary architecture.
# $(4): LD_LIBRARY_PATH or undefined - used in case libartd.so is not in /system/lib/
define define-art-gtest-rule-target
@@ -495,7 +495,7 @@
endif
gtest_rule := test-art-target-gtest-$(1)$$($(3)ART_PHONY_TEST_TARGET_SUFFIX)
- gtest_exe := $(OUT_DIR)/$(2)
+ gtest_exe := $(2)
gtest_target_exe := $$(patsubst $(PRODUCT_OUT)/%,/%,$$(gtest_exe))
# Add the test dependencies to test-art-target-sync, which will be a prerequisite for the test
@@ -559,7 +559,7 @@
gtest_rule := test-art-host-gtest-$$(gtest_suffix)
gtest_output := $(call intermediates-dir-for,PACKAGING,art-host-gtest,HOST)/$$(gtest_suffix).xml
$$(call dist-for-goals,$$(gtest_rule),$$(gtest_output):gtest/$$(gtest_suffix))
- gtest_exe := $(OUT_DIR)/$(2)
+ gtest_exe := $(2)
# Dependencies for all host gtests.
gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
diff --git a/build/art.go b/build/art.go
index 31de57f..56eec54 100644
--- a/build/art.go
+++ b/build/art.go
@@ -276,7 +276,7 @@
defer artTestMutex.Unlock()
tests := testMap[name]
- tests = append(tests, ctx.Path().RelPathString())
+ tests = append(tests, ctx.Path().ToMakePath().String())
testMap[name] = tests
}
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index a2349a4..08f4fd1 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -59,16 +59,16 @@
$(ART_HOST_EXECUTABLES) \
$(HOST_OUT_EXECUTABLES)/hprof-conv \
$(HOST_OUT_EXECUTABLES)/signal_dumper \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagent) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagentd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtistress) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtistressd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libartagent) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libartagentd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libarttest) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libarttestd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libnativebridgetest) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libnativebridgetestd) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagent) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagentd) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtistress) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtistressd) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libartagent) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libartagentd) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libarttest) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libarttestd) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libnativebridgetest) \
+ $(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libnativebridgetestd) \
$(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION) \
$(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkd$(ART_HOST_SHLIB_EXTENSION) \
@@ -78,16 +78,16 @@
ifneq ($(HOST_PREFER_32_BIT),true)
ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtiagent) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtiagentd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtistress) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtistressd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libartagent) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libartagentd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libarttest) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libarttestd) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libnativebridgetest) \
- $(OUT_DIR)/$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libnativebridgetestd) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtiagent) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtiagentd) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtistress) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libtistressd) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libartagent) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libartagentd) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libarttest) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libarttestd) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libnativebridgetest) \
+ $(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_libnativebridgetestd) \
$(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION) \
$(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkd$(ART_HOST_SHLIB_EXTENSION) \