Revert back from OSGI -> bundled jars

We tried the approach of replacing bundled jars with OSGI
jars. However, this eventually ended up resulting in
ClassCircularityError thrown at runtime when running on
Java 7. As far as we could diagnose, the issue seems to
be that:
 - LayoutLibrary attempts to load layoutlib.jar (which is
   a regular jar present inside the android sdk data folder).
 - The class loader passed to layoutlib is the LayoutLibrary's
   class loader.
 - The classes inside the layout library then attempt to
   load classes from a different OSGI jar (layoutlib-api)
 - At this time, we receive a ClassCircularityError

Most of our other jars depend on layoutlib-api, so it is
not possible to just bundle layoutlib-api. So for now, we
are back to bundling jars.

Change-Id: Ic8c838a1a7e90e1bc6b8c5251341b1ded46053ba

4 files changed, 30 insertions, 6 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 118e6b451..6a0423606 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -5,4 +5,20 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
+    <classpathentry kind="lib" path="kxml2-2.3.0.jar"/>
+    <classpathentry kind="lib" path="easymock.jar"/>
+    <classpathentry kind="lib" path="testutils.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/ninepatch.jar" sourcepath="/ninepatch"/>
+    <classpathentry kind="lib" path="/plugin-base/libs/sdklib.jar" sourcepath="/SdkLib"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/rule-api.jar" sourcepath="/rule-api"/>
+    <classpathentry kind="lib" path="/plugin-base/libs/common.jar" sourcepath="/common"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/lint-api.jar" sourcepath="/lint-api"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/lint-checks.jar" sourcepath="/lint-checks"/>
+    <classpathentry kind="lib" path="/plugin-base/libs/sdk-common.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.2.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/asm-4.0.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-4.0.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-4.0.jar"/>
+    <classpathentry kind="lib" path="/plugin-adt/libs/manifest-merger.jar" sourcepath="/manifest-merger"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore b/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore
deleted file mode 100644
index d392f0e82..000000000
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
index 75a39f88c..45d3a37ef 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,11 @@ Bundle-SymbolicName: com.android.ide.eclipse.tests
 Bundle-Version: 22.6.2.qualifier
 Bundle-Vendor: The Android Open Source Project
 Fragment-Host: com.android.ide.eclipse.adt;bundle-version="21.0.0"
-Require-Bundle: org.junit,
- com.android.tools.testutils;bundle-version="22.9.0"
+Require-Bundle: org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/kxml2-2.3.0.jar,
+ libs/testutils.jar,
+ libs/lint-api.jar,
+ libs/lint-checks.jar,
+ libs/easymock.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index 186753b03..2a82227c5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
@@ -6,7 +6,12 @@ bin.includes = META-INF/,\
                test.xml,\
                prefs.template,\
                unittest.xml,\
+               kxml2-2.3.0.jar,\
+               testutils.jar,\
+               layoutlib.jar,\
+               lint-api.jar,\
+               lint-checks.jar,\
                unittests/com/android/sdklib/testdata/,\
                unittests/com/android/layoutlib/testdata/,\
-               unittests/com/android/ide/eclipse/testdata/
-
+               unittests/com/android/ide/eclipse/testdata/,\
+               easymock.jar