diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 98d5fb1089..54a33b2305 100644 --- a/Android.mk +++ b/Android.mk @@ -382,10 +382,10 @@ build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TAR # Rules for building all dependencies for tests. .PHONY: build-art-host-tests -build-art-host-tests: build-art-host $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_GTEST_DEPENDENCIES) +build-art-host-tests: build-art-host $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_GTEST_DEPENDENCIES) .PHONY: build-art-target-tests -build-art-target-tests: build-art-target $(TEST_ART_TARGET_SYNC_DEPS) +build-art-target-tests: build-art-target $(TEST_ART_RUN_TEST_DEPENDENCIES) $(TEST_ART_TARGET_SYNC_DEPS) ######################################################################## # targets to switch back and forth from libdvm to libart diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 8b074ae04f..d224f43728 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -32,11 +32,14 @@ art_run_tests_dir := $(call intermediates-dir-for,PACKAGING,art-run-tests)/DATA # an empty file touched in the intermediate directory. TEST_ART_RUN_TEST_BUILD_RULES := +# Dependencies for actually running a run-test. +TEST_ART_RUN_TEST_DEPENDENCIES := $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(HOST_OUT_EXECUTABLES)/smali $(HOST_OUT_EXECUTABLES)/dexmerger + # Helper to create individual build targets for tests. Must be called with $(eval). # $(1): the test number define define-build-art-run-test dmart_target := $(art_run_tests_dir)/art-run-tests/$(1)/touch -$$(dmart_target): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(HOST_OUT_EXECUTABLES)/smali $(HOST_OUT_EXECUTABLES)/dexmerger +$$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@) $(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \ SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \ |