From fb0b7c06a7629a37d9c12e54992eb81fa8b7f630 Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@android.com>
Date: Tue, 27 Jul 2010 17:57:38 -0700
Subject: [PATCH 1/2] Change hosttestlib to use ddm-prebuilt.

Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
---
 testrunner/test_defs/host_test.py | 7 ++-----
 tools/hosttestlib/Android.mk      | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/testrunner/test_defs/host_test.py b/testrunner/test_defs/host_test.py
index 81050754c..273042ab5 100644
--- 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 2184d3bb6..c1aa33b40 100644
--- 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)
 

From 9b2d35f0a81cb0483337ab0a776c5e9287e84dbf Mon Sep 17 00:00:00 2001
From: Andy Stadler <stadler@android.com>
Date: Tue, 21 Sep 2010 14:07:22 -0700
Subject: [PATCH 2/2] DO NOT MERGE Classpath cleanup in libcore

* libcore/security no longer exists
* many other dirs under libcore had no java code

Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
---
 ide/eclipse/.classpath | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index e7d5e0bf2..d535128a1 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -65,31 +65,11 @@
 	<classpathentry kind="src" path="development/samples/Snake/src"/>
 	<classpathentry kind="src" path="development/samples/Snake/tests/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/icu/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/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/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="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>
 	<classpathentry kind="src" path="out/target/common/obj/APPS/Browser_intermediates/src/src"/>