LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8ddb2873: Change hosttestlib to use ddm-prebuilt.

Browse Source 
Merge commit '8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp

* commit '8ddb2873df96c7181c9358f5c9286e273648bf89':
  Change hosttestlib to use ddm-prebuilt.
This commit is contained in:
Brett Chabot
2010-07-28 11:37:12 -07:00
committed by Android Git Automerger
parent 255ee00edc 8ddb2873df
commit d53cf3ba04
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testrunner/test_defs/host_test.py
View File

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

2
tools/hosttestlib/Android.mk
View File

@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := hosttestlib LOCAL_MODULE := hosttestlib
LOCAL_JAVA_LIBRARIES := ddmlib junit LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt junit
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)