diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-12 15:09:42 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-12 15:12:56 +0100 |
| commit | 17b1dcba9e4dc956d88a0235307471b8ba7c4591 (patch) | |
| tree | 7b4b686d8dc77a69e01d301b7831617ef4c76fb0 /Android.mk | |
| parent | 231a9538fcf96b016f8bea211f0c09359c4a182f (diff) | |
| download | art-17b1dcba9e4dc956d88a0235307471b8ba7c4591.tar.gz art-17b1dcba9e4dc956d88a0235307471b8ba7c4591.tar.bz2 art-17b1dcba9e4dc956d88a0235307471b8ba7c4591.zip | |
Add target gtest dependencies to build-art-target-tests.
Now that we're not using makefile for syncing, we've lost
that dependency.
Test: test-art-target-gtest
Change-Id: If0e4c9e332c34b5ceb1667945cc5c1a8eedc8768
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 925f6e4451..bd3027dda8 100644 --- a/Android.mk +++ b/Android.mk @@ -98,6 +98,8 @@ 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) + # Make sure /system is writable on the device. TEST_ART_ADB_ROOT_AND_REMOUNT := \ ($(ADB) root && \ @@ -484,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) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES) +build-art-target-tests: build-art-target $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_TARGET_GTEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES) ######################################################################## # targets to switch back and forth from libdvm to libart |