Change hosttestlib to use ddm-prebuilt.

Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2

diff --git a/testrunner/test_defs/host_test.py b/testrunner/test_defs/host_test.py
index 8105075..273042a 100644 (file)
--- a/testrunner/test_defs/host_test.py
+++ b/testrunner/test_defs/host_test.py
@@ -31,15 +31,12 @@ class HostTestSuite(test_suite.AbstractTestSuite):
 
   _JUNIT_JAR_NAME = "junit.jar"
   _HOSTTESTLIB_NAME = "hosttestlib.jar"
-  _DDMLIB_NAME = "ddmlib.jar"
+  _DDMLIB_NAME = "ddmlib-prebuilt.jar"
   _lib_names = [_JUNIT_JAR_NAME, _HOSTTESTLIB_NAME, _DDMLIB_NAME]
 
   _JUNIT_BUILD_PATH = os.path.join("external", "junit")
   _HOSTTESTLIB_BUILD_PATH = os.path.join("development", "tools", "hosttestlib")
-  _DDMLIB_BUILD_PATH = os.path.join("development", "tools", "ddms", "libs",
-                                    "ddmlib")
-  _LIB_BUILD_PATHS = [_JUNIT_BUILD_PATH, _HOSTTESTLIB_BUILD_PATH,
-                      _DDMLIB_BUILD_PATH]
+  _LIB_BUILD_PATHS = [_JUNIT_BUILD_PATH, _HOSTTESTLIB_BUILD_PATH ]
 
   # main class for running host tests
   # TODO: should other runners be supported, and make runner an attribute of

diff --git a/tools/hosttestlib/Android.mk b/tools/hosttestlib/Android.mk
index 2184d3b..c1aa33b 100644 (file)
--- a/tools/hosttestlib/Android.mk
+++ b/tools/hosttestlib/Android.mk
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_MODULE := hosttestlib
 
-LOCAL_JAVA_LIBRARIES := ddmlib junit
+LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt junit
 
 include $(BUILD_HOST_JAVA_LIBRARY)