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

Merge branch 'gingerbread' into gingerbread-release

Browse Source
This commit is contained in:
The Android Automerger
2010-09-22 07:12:08 -07:00
parent 7f6880bdd3 14282f9796
commit e6fa367ebc
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ide/eclipse/.classpath
View File

@@ -65,31 +65,11 @@
<classpathentry kind="src" path="development/samples/Snake/src"/> <classpathentry kind="src" path="development/samples/Snake/src"/>
<classpathentry kind="src" path="development/samples/Snake/tests/src"/> <classpathentry kind="src" path="development/samples/Snake/tests/src"/>
<classpathentry kind="src" path="development/apps/Term/src"/> <classpathentry kind="src" path="development/apps/Term/src"/>
<classpathentry kind="src" path="libcore/annotation/src/main/java"/>
<classpathentry kind="src" path="libcore/archive/src/main/java"/>
<classpathentry kind="src" path="libcore/auth/src/main/java"/>
<classpathentry kind="src" path="libcore/awt-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/concurrent/src/main/java"/>
<classpathentry kind="src" path="libcore/crypto/src/main/java"/>
<classpathentry kind="src" path="libcore/dalvik/src/main/java"/> <classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="libcore/icu/src/main/java"/> <classpathentry kind="src" path="libcore/icu/src/main/java"/>
<classpathentry kind="src" path="libcore/json/src/main/java"/> <classpathentry kind="src" path="libcore/json/src/main/java"/>
<classpathentry kind="src" path="libcore/junit/src/main/java"/> <classpathentry kind="src" path="libcore/junit/src/main/java"/>
<classpathentry kind="src" path="libcore/logging/src/main/java"/>
<classpathentry kind="src" path="libcore/luni-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/luni/src/main/java"/> <classpathentry kind="src" path="libcore/luni/src/main/java"/>
<classpathentry kind="src" path="libcore/math/src/main/java"/>
<classpathentry kind="src" path="libcore/nio_char/src/main/java"/>
<classpathentry kind="src" path="libcore/nio/src/main/java"/>
<classpathentry kind="src" path="libcore/openssl/src/main/java"/>
<classpathentry kind="src" path="libcore/prefs/src/main/java"/>
<classpathentry kind="src" path="libcore/regex/src/main/java"/>
<classpathentry kind="src" path="libcore/security-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/security/src/main/java"/>
<classpathentry kind="src" path="libcore/sql/src/main/java"/>
<classpathentry kind="src" path="libcore/suncompat/src/main/java"/>
<classpathentry kind="src" path="libcore/text/src/main/java"/>
<classpathentry kind="src" path="libcore/x-net/src/main/java"/>
<classpathentry kind="src" path="libcore/xml/src/main/java"/> <classpathentry kind="src" path="libcore/xml/src/main/java"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/> <classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Browser_intermediates/src/src"/> <classpathentry kind="src" path="out/target/common/obj/APPS/Browser_intermediates/src/src"/>

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)