diff options
| -rw-r--r-- | test/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/Android.mk b/test/Android.mk index 08a925c7a4..aacd7b4bbf 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -191,12 +191,13 @@ $(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call declare-test-art-oat-target ######################################################################## TEST_ART_RUN_TEST_MAKE_TARGETS := +art_run_tests_dir := $(call intermediates-dir-for,PACKAGING,art-run-tests)/DATA # Helper to create individual build targets for tests. # Must be called with $(eval) # $(1): the test number define declare-make-art-run-test -dmart_target := $(TARGET_OUT_DATA)/art-run-tests/$(1)/touch +dmart_target := $(art_run_tests_dir)/art-run-tests/$(1)/touch $$(dmart_target): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@) $(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) $(LOCAL_PATH)/run-test --build-only --output-path $$(abspath $$(dir $$@)) $(1) @@ -222,6 +223,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_MODULE := art-run-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(TEST_ART_RUN_TEST_MAKE_TARGETS) +# The build system use this flag to pick up files generated by declare-make-art-run-test. +LOCAL_PICKUP_FILES := $(art_run_tests_dir) + include $(BUILD_PHONY_PACKAGE) # clear temp vars |