commit b9cc1ca34adec5e9254f78e9ee40d57348aa2fd0
author Brian Carlstrom <bdc@google.com> Fri Jan 27 00:57:42 2012 -0800
committer Brian Carlstrom <bdc@google.com> Fri Jan 27 17:27:17 2012 -0800
tree bed33448b7be0223612d31164c20c851a713f543
parent 9b06a0d87757d76b05e5f310ce2b9a5a8c746bdf

Remove need for libarttest.so for gtests for tradefed

Change-Id: I18b39b9fc6f0bfa163ef7e7063864696d6958ad0

Android.mk

diff --git a/Android.mk b/Android.mk
index 0b8d0eb..c654626 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,8 +65,8 @@
 
 ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
 
-ART_HOST_TEST_DEPENDENCIES   := $(ART_HOST_DEPENDENCIES)   $(ART_TEST_OAT_FILES)
-ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TEST_OAT_FILES)
+ART_HOST_TEST_DEPENDENCIES   := $(ART_HOST_DEPENDENCIES)   $(ART_HOST_TEST_EXECUTABLES)   $(ART_TEST_OAT_FILES)
+ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXECUTABLES) $(ART_TEST_OAT_FILES)
 
 ########################################################################
 # host test targets
@@ -97,7 +97,7 @@
 	@echo test-art-target PASSED
 
 .PHONY: test-art-target-sync
-test-art-target-sync: $(ART_TARGET_TEST_DEPENDENCIES)
+test-art-target-sync: $(ART_TARGET_TEST_DEPENDENCIES) $(ART_TEST_OUT)/libarttest.so
 	adb remount
 	adb sync
 	adb shell mkdir -p $(ART_TEST_DIR)