commit 32b4b2a30636360756058524f8491ee4cd81c423
author Brian Carlstrom <bdc@google.com> Tue Jan 31 16:21:40 2012 -0800
committer Brian Carlstrom <bdc@google.com> Tue Jan 31 16:24:58 2012 -0800
tree 6138e41ee2566727b0469ce1cfeaf23a2646fcad
parent 162a31c25e1e52df8d6d1fef4653da35d715e83b

Test changes to support tradefed

- move jar files for gtest support to /data/nativetest/art
- tag jar files in /data/art-test as "tests"

Change-Id: I43fe38bee4a47096754ee41c3207a93a3d3ad830

Android.mk

diff --git a/Android.mk b/Android.mk
index c41d031..fa8349b 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_HOST_TEST_EXECUTABLES)   $(ART_TEST_OAT_FILES)
-ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXECUTABLES) $(ART_TEST_OAT_FILES)
+ART_HOST_TEST_DEPENDENCIES   := $(ART_HOST_DEPENDENCIES)   $(ART_HOST_TEST_EXECUTABLES)   $(ART_TEST_DEX_FILES) $(ART_TEST_OAT_FILES)
+ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXECUTABLES) $(ART_TEST_DEX_FILES) $(ART_TEST_OAT_FILES)
 
 ########################################################################
 # host test targets