Move target run-test dependencies to ART_TEST_TARGET_RUN_TEST_DEPENDENCIES.
Test: buildbot-build.sh && chroot sync && test.py
Change-Id: I7c28894f03bb69812f2c3007af4b45f428891b14
diff --git a/Android.mk b/Android.mk
index bd3027d..b9f6170 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,7 +98,7 @@
include $(art_path)/build/Android.gtest.mk
include $(art_path)/test/Android.run-test.mk
-TEST_ART_TARGET_SYNC_DEPS += $(ART_TEST_TARGET_GTEST_DEPENDENCIES)
+TEST_ART_TARGET_SYNC_DEPS += $(ART_TEST_TARGET_GTEST_DEPENDENCIES) $(ART_TEST_TARGET_RUN_TEST_DEPENDENCIES)
# Make sure /system is writable on the device.
TEST_ART_ADB_ROOT_AND_REMOUNT := \
@@ -486,7 +486,7 @@
build-art-host-tests: build-art-host $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_GTEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES)
.PHONY: build-art-target-tests
-build-art-target-tests: build-art-target $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_TARGET_GTEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES)
+build-art-target-tests: build-art-target $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_TARGET_RUN_TEST_DEPENDENCIES) $(ART_TEST_TARGET_GTEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES)
########################################################################
# targets to switch back and forth from libdvm to libart