diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-12 15:23:56 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-12 15:25:47 +0100 |
| commit | 375d4eb1296d020a5395ba9e85ec5c3c1858133e (patch) | |
| tree | 7b7076d5a4e0225bb55c21564e7d184b6f5ede92 /Android.mk | |
| parent | 89cf7805a8e8977cc54ac62f7448e9d895376c84 (diff) | |
| download | art-375d4eb1296d020a5395ba9e85ec5c3c1858133e.tar.gz art-375d4eb1296d020a5395ba9e85ec5c3c1858133e.tar.bz2 art-375d4eb1296d020a5395ba9e85ec5c3c1858133e.zip | |
Move target run-test dependencies to ART_TEST_TARGET_RUN_TEST_DEPENDENCIES.
Test: buildbot-build.sh && chroot sync && test.py
Change-Id: I7c28894f03bb69812f2c3007af4b45f428891b14
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index bd3027dda8..b9f617035c 100644 --- a/Android.mk +++ b/Android.mk @@ -98,7 +98,7 @@ include $(art_path)/build/Android.common_test.mk 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-unbundled-golem: art-runtime linker oatdump $(TARGET_CORE_JARS) crash_ 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 |