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

36 files changed, 296 insertions, 107 deletions

diff --git a/eclipse/.gitignore b/eclipse/.gitignore
new file mode 100644
index 000000000..78dbaee0a
--- /dev/null
+++ b/eclipse/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+plugins/*/libs
+plugins/*/*.target
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index 10b4873c0..fcf27a570 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -3,5 +3,20 @@
 	<classpathentry excluding="Makefile|resources/" kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry exported="true" kind="lib" path="libs/ninepatch.jar" sourcepath="/ninepatch"/>
+    <classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar" sourcepath="/sdkuilib"/>
+    <classpathentry exported="true" kind="lib" path="libs/rule-api.jar" sourcepath="/rule-api"/>
+    <classpathentry exported="true" kind="lib" path="libs/lint-api.jar" sourcepath="/lint-api"/>
+    <classpathentry exported="true" kind="lib" path="libs/lint-checks.jar" sourcepath="/lint-checks"/>
+    <classpathentry exported="true" kind="lib" path="libs/asset-studio.jar" sourcepath="/asset-studio"/>
+    <classpathentry exported="true" kind="lib" path="libs/ant-glob.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.20.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/>
+    <classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/propertysheet.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/asm-4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/asm-analysis-4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/asm-tree-4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/swtmenubar.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore b/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
deleted file mode 100644
index c944794f5..000000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.jar
-*.target
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index ba3a01ee9..5df52db5a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -3,7 +3,22 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Android Development Toolkit
 Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
 Bundle-Version: 22.6.2.qualifier
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/sdkuilib.jar,
+ libs/ninepatch.jar,
+ libs/freemarker-2.3.20.jar,
+ libs/rule-api.jar,
+ libs/asset-studio.jar,
+ libs/lint-api.jar,
+ libs/lint-checks.jar,
+ libs/lombok-ast-0.2.2.jar,
+ libs/asm-4.0.jar,
+ libs/asm-tree-4.0.jar,
+ libs/asm-analysis-4.0.jar,
+ libs/propertysheet.jar,
+ libs/ant-glob.jar,
+ libs/swtmenubar.jar,
+ libs/manifest-merger.jar
 Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: com.android.ide.eclipse.base,
@@ -36,30 +51,7 @@ Require-Bundle: com.android.ide.eclipse.base,
  org.eclipse.ltk.core.refactoring,
  org.eclipse.ltk.ui.refactoring,
  org.eclipse.core.expressions,
- org.eclipse.compare,
- com.android.tools.asset-studio;bundle-version="22.9.0",
- com.android.tools.common;bundle-version="22.9.0",
- com.android.tools.layoutlib.api;bundle-version="22.9.0",
- com.android.tools.sdk-common;bundle-version="22.9.0",
- com.google.guava;bundle-version="15.0.0",
- com.android.tools.sdklib;bundle-version="22.9.0",
- org.ow2.asm;bundle-version="4.0.0",
- org.ow2.asm.analysis;bundle-version="4.0.0",
- org.ow2.asm.tree;bundle-version="4.0.0",
- com.android.tools.sdkstats;bundle-version="22.9.0",
- com.android.tools.sdkuilib;bundle-version="22.9.0",
- com.android.tools.build.manifest-merger;bundle-version="22.9.0",
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.android.tools.lint.api;bundle-version="22.9.0",
- com.android.tools.lint.checks;bundle-version="22.9.0",
- com.android.tools.external.lombok.ast;bundle-version="0.2.2",
- com.android.tools.ddms.ddmuilib;bundle-version="22.9.0",
- com.android.tools.dvlib;bundle-version="22.9.0",
- com.android.tools.rule-api;bundle-version="22.9.0",
- com.android.tools.external.propertysheet;bundle-version="1.0.0",
- net.sf.kxml.2;bundle-version="2.3.0",
- com.android.tools.external.ant-glob;bundle-version="1.0.0",
- org.freemarker.freemarker;bundle-version="2.3.20"
+ org.eclipse.compare
 Bundle-ActivationPolicy: lazy
 Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.common.layout.grid;x-friends:="com.android.ide.eclipse.tests",
@@ -125,7 +117,22 @@ Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclips
  com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.internal.wizards.newxmlfile;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.internal.wizards.templates;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.io;x-friends:="com.android.ide.eclipse.tests"
+ com.android.ide.eclipse.adt.io;x-friends:="com.android.ide.eclipse.tests",
+ com.android.manifmerger;x-friends:="com.android.ide.eclipse.tests",
+ com.android.ninepatch;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.repository.core;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.repository.icons;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.repository.ui;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.tasks;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.widgets;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.repository;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.ui;x-friends:="com.android.ide.eclipse.tests",
+ com.android.tools.lint.checks;x-friends:="com.android.ide.eclipse.tests",
+ com.android.tools.lint.client.api;x-friends:="com.android.ide.eclipse.tests",
+ com.android.tools.lint.detector.api;x-friends:="com.android.ide.eclipse.tests",
+ freemarker.cache;x-friends:="com.android.ide.eclipse.tests",
+ freemarker.template;x-friends:="com.android.ide.eclipse.tests"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.ibm.icu.text,
  org.eclipse.core.variables
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
index fc68022ee..32d7d7e75 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
@@ -2,6 +2,7 @@ bin.includes = plugin.xml,\
                META-INF/,\
                icons/,\
                .,\
+               libs/,\
                templates/,\
                about.ini,\
                about.properties,\
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java
index 1c7c2e35d..3f882842b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java
@@ -76,7 +76,8 @@ public final class DexWrapper {
             }
             URL url = f.toURI().toURL();
 
-            URLClassLoader loader = new URLClassLoader(new URL[] { url },
+            @SuppressWarnings("resource")
+			URLClassLoader loader = new URLClassLoader(new URL[] { url },
                     DexWrapper.class.getClassLoader());
 
             // get the classes.
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
index ad32c83a7..fc77c11f7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+    <classpathentry exported="true" kind="lib" path="libs/dvlib.jar" sourcepath="/dvlib"/>
+    <classpathentry exported="true" kind="lib" path="libs/common.jar" sourcepath="/common"/>
+    <classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/commons-compress-1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/commons-logging-1.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/guava-15.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/httpclient-4.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/kxml2-2.3.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/layoutlib-api.jar" sourcepath="/layoutlib-api"/>
+    <classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/sdklib"/>
+    <classpathentry exported="true" kind="lib" path="libs/sdkstats.jar" sourcepath="/sdkstats"/>
+    <classpathentry exported="true" kind="lib" path="libs/sdk-common.jar" sourcepath="/sdk-common"/>
+    <classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
index 6dcdaaec6..79a1c6526 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
@@ -4,10 +4,135 @@ Bundle-Name: Common Android Utilities
 Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true
 Bundle-Version: 22.6.2.qualifier
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- com.android.tools.sdkstats;bundle-version="22.9.0"
+ org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: The Android Open Source Project
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/common.jar,
+ libs/commons-codec-1.4.jar,
+ libs/commons-compress-1.0.jar,
+ libs/commons-logging-1.1.1.jar,
+ libs/guava-15.0.jar,
+ libs/httpclient-4.1.1.jar,
+ libs/httpcore-4.1.jar,
+ libs/httpmime-4.1.jar,
+ libs/kxml2-2.3.0.jar,
+ libs/layoutlib-api.jar,
+ libs/sdklib.jar,
+ libs/sdkstats.jar,
+ libs/dvlib.jar,
+ libs/sdk-common.jar
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.android.ide.eclipse.base
+Export-Package: com.android,
+ com.android.annotations,
+ com.android.annotations.concurrency,
+ com.android.dvlib,
+ com.android.ide.common.internal,
+ com.android.ide.common.packaging,
+ com.android.ide.common.rendering,
+ com.android.ide.common.rendering.api,
+ com.android.ide.common.rendering.legacy,
+ com.android.ide.common.res2,
+ com.android.ide.common.resources,
+ com.android.ide.common.resources.configuration,
+ com.android.ide.common.sdk,
+ com.android.ide.common.xml,
+ com.android.ide.eclipse.base,
+ com.android.ide.eclipse.base.internal.preferences,
+ com.android.io,
+ com.android.layoutlib.api,
+ com.android.prefs,
+ com.android.resources,
+ com.android.sdklib,
+ com.android.sdklib.build,
+ com.android.sdklib.devices,
+ com.android.sdklib.internal.avd,
+ com.android.sdklib.internal.build,
+ com.android.sdklib.internal.project,
+ com.android.sdklib.internal.repository,
+ com.android.sdklib.internal.repository.archives,
+ com.android.sdklib.internal.repository.packages,
+ com.android.sdklib.internal.repository.sources,
+ com.android.sdklib.internal.repository.updater,
+ com.android.sdklib.io,
+ com.android.sdklib.repository,
+ com.android.sdklib.repository.descriptors,
+ com.android.sdklib.repository.local,
+ com.android.sdklib.repository.remote,
+ com.android.sdklib.util,
+ com.android.sdkstats,
+ com.android.util,
+ com.android.utils,
+ com.android.xml,
+ com.google.common.annotations,
+ com.google.common.base,
+ com.google.common.base.internal,
+ com.google.common.cache,
+ com.google.common.collect,
+ com.google.common.eventbus,
+ com.google.common.hash,
+ com.google.common.io,
+ com.google.common.math,
+ com.google.common.net,
+ com.google.common.primitives,
+ com.google.common.reflect,
+ com.google.common.util.concurrent,
+ org.apache.commons.codec,
+ org.apache.commons.codec.binary,
+ org.apache.commons.codec.digest,
+ org.apache.commons.codec.language,
+ org.apache.commons.codec.net,
+ org.apache.commons.compress.archivers,
+ org.apache.commons.compress.archivers.ar,
+ org.apache.commons.compress.archivers.cpio,
+ org.apache.commons.compress.archivers.jar,
+ org.apache.commons.compress.archivers.tar,
+ org.apache.commons.compress.archivers.zip,
+ org.apache.commons.compress.changes,
+ org.apache.commons.compress.compressors,
+ org.apache.commons.compress.compressors.bzip2,
+ org.apache.commons.compress.compressors.gzip,
+ org.apache.commons.compress.utils,
+ org.apache.commons.logging,
+ org.apache.commons.logging.impl,
+ org.apache.http,
+ org.apache.http.annotation,
+ org.apache.http.auth,
+ org.apache.http.auth.params,
+ org.apache.http.client,
+ org.apache.http.client.entity,
+ org.apache.http.client.methods,
+ org.apache.http.client.params,
+ org.apache.http.client.protocol,
+ org.apache.http.client.utils,
+ org.apache.http.conn,
+ org.apache.http.conn.params,
+ org.apache.http.conn.routing,
+ org.apache.http.conn.scheme,
+ org.apache.http.conn.ssl,
+ org.apache.http.conn.util,
+ org.apache.http.cookie,
+ org.apache.http.cookie.params,
+ org.apache.http.entity,
+ org.apache.http.entity.mime,
+ org.apache.http.entity.mime.content,
+ org.apache.http.impl,
+ org.apache.http.impl.auth,
+ org.apache.http.impl.client,
+ org.apache.http.impl.conn,
+ org.apache.http.impl.conn.tsccm,
+ org.apache.http.impl.cookie,
+ org.apache.http.impl.entity,
+ org.apache.http.impl.io,
+ org.apache.http.io,
+ org.apache.http.message,
+ org.apache.http.params,
+ org.apache.http.protocol,
+ org.apache.http.util,
+ org.kxml2.io,
+ org.kxml2.kdom,
+ org.kxml2.wap,
+ org.kxml2.wap.syncml,
+ org.kxml2.wap.wml,
+ org.kxml2.wap.wv,
+ org.xmlpull.v1
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/build.properties b/eclipse/plugins/com.android.ide.eclipse.base/build.properties
index ef85877c2..d30490239 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.base/build.properties
@@ -1,5 +1,6 @@
 output.. = bin/
 bin.includes = .,\
+               libs/,\
                META-INF/,\
                plugin.xml
 jars.compile.order = .
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
index 751c8f2e5..d5d21c875 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
@@ -3,5 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="lib" path="libs/jfreechart-1.0.9.jar"/>
+    <classpathentry kind="lib" path="libs/jcommon-1.0.12.jar"/>
+    <classpathentry kind="lib" path="libs/jfreechart-swt-1.0.9.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/ddmlib.jar" sourcepath="/ddmlib"/>
+    <classpathentry exported="true" kind="lib" path="libs/ddmuilib.jar" sourcepath="/ddmuilib"/>
+    <classpathentry exported="true" kind="lib" path="libs/uiautomatorviewer.jar" sourcepath="/uiautomatorviewer/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
index fc1e63a24..8b0389ab8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
@@ -12,16 +12,32 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.core.filesystem,
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.android.tools.ddms.ddmuilib;bundle-version="22.9.0",
- com.android.tools.common;bundle-version="22.9.0",
- com.android.tools.uiautomatorviewer;bundle-version="22.9.0",
- com.android.ide.eclipse.base;bundle-version="22.6.2",
- com.google.guava;bundle-version="15.0.0"
+ com.android.ide.eclipse.base
 Bundle-ActivationPolicy: lazy
-Export-Package: com.android.ide.eclipse.ddms,
+Export-Package: com.android.ddmlib,
+ com.android.ddmlib.log,
+ com.android.ddmlib.testrunner,
+ com.android.ddmlib.utils,
+ com.android.ddmuilib,
+ com.android.ddmuilib.actions,
+ com.android.ddmuilib.annotation,
+ com.android.ddmuilib.console,
+ com.android.ddmuilib.explorer,
+ com.android.ddmuilib.handler,
+ com.android.ddmuilib.heap,
+ com.android.ddmuilib.location,
+ com.android.ddmuilib.log.event,
+ com.android.ddmuilib.logcat,
+ com.android.ddmuilib.net,
+ com.android.ide.eclipse.ddms,
  com.android.ide.eclipse.ddms.i18n,
  com.android.ide.eclipse.ddms.preferences,
  com.android.ide.eclipse.ddms.views
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/ddmlib.jar,
+ libs/ddmuilib.jar,
+ libs/jcommon-1.0.12.jar,
+ libs/jfreechart-1.0.9.jar,
+ libs/jfreechart-swt-1.0.9.jar,
+ libs/uiautomatorviewer.jar
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/build.properties b/eclipse/plugins/com.android.ide.eclipse.ddms/build.properties
index 976ba14be..3c02154cc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.xml,\
                .,\
+               libs/,\
                schema/,\
                about.html,\
                about.ini,\
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
index ad32c83a7..ed52ce003 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
@@ -3,5 +3,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+    <classpathentry kind="lib" path="libs/host-libprotobuf-java-2.3.0-lite.jar"/>
+    <classpathentry kind="lib" path="libs/liblzf.jar"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
index bf5248c30..119da2838 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
@@ -7,5 +7,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit4;bundle-version="4.5.0";resolution:=optional,
  com.android.ide.eclipse.gldebugger,
  org.eclipse.swt,
- org.junit;bundle-version="4.11.0";resolution:=optional,
- com.android.tools.external.libprotobuf-java-lite;bundle-version="2.3.0"
+ org.junit;bundle-version="4.11.0";resolution:=optional
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
index 1fa3e6803..aaeec62f7 100755
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
@@ -3,5 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+    <classpathentry kind="lib" path="libs/host-libprotobuf-java-2.3.0-lite.jar"/>
+    <classpathentry kind="lib" path="libs/liblzf-1.0.jar" />
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.gitignore b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.gitignore
deleted file mode 100644
index 2fd4c3b35..000000000
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libs/
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
index 1c1b304f7..d925552e5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
@@ -11,16 +11,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.filesystem,
  org.eclipse.ui.console,
  com.android.ide.eclipse.ddms,
- com.android.ide.eclipse.base,
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.google.guava;bundle-version="15.0.0",
- com.android.tools.external.libprotobuf-java-lite;bundle-version="2.3.0",
- com.android.tools.external.liblzf;bundle-version="1.0.0",
- com.android.tools.ddms.ddmuilib;bundle-version="22.9.0",
- com.android.tools.common;bundle-version="22.9.0"
+ com.android.ide.eclipse.base
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: libs/host-libprotobuf-java-2.3.0-lite.jar,
- libs/liblzf.jar,
+ libs/liblzf-1.0.jar,
  .
 Bundle-Vendor: The Android Open Source Project
 Export-Package: com.android.ide.eclipse.gltrace;x-friends:="com.android.ide.eclipse.gldebugger.tests",
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties b/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties
index c446f3c77..4f3d57a4b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = plugin.xml,\

                META-INF/,\

                .,\

+               libs/,\

                icons/,\

                entries.in,

diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
index 1fa3e6803..7073f2091 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
@@ -3,5 +3,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+    <classpathentry kind="lib" path="libs/hierarchyviewer2lib.jar" sourcepath="/hierarchyviewer2lib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.gitignore b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.gitignore
deleted file mode 100644
index 2fd4c3b35..000000000
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libs/
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index 59295aee3..958dad3df 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
@@ -11,10 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.console,
  com.android.ide.eclipse.ddms,
- com.android.ide.eclipse.base,
- com.android.tools.hierarchyviewer2lib;bundle-version="22.9.0",
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.android.tools.ddms.ddmuilib;bundle-version="22.9.0"
-Bundle-ClassPath: .
+ com.android.ide.eclipse.base
+Bundle-ClassPath: .,
+ libs/hierarchyviewer2lib.jar
 Export-Package: com.android.ide.eclipse.hierarchyviewer
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
index 59eae6819..f7e5d3fa9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.xml,\
                .,\
+               libs/,\
                about.html,\
                about.ini,\
                about.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
index 1fa3e6803..fa341c0e1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
@@ -3,5 +3,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+    <classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
index 64078a14c..f533e2b72 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
@@ -8,15 +8,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  com.android.ide.eclipse.ddms,
  com.android.ide.eclipse.traceview,
- com.android.ide.eclipse.base,
- com.android.tools.sdkuilib;bundle-version="22.9.0",
- com.android.tools.sdklib;bundle-version="22.9.0",
- com.android.tools.sdkstats;bundle-version="22.9.0",
- com.android.tools.common;bundle-version="22.9.0",
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.android.tools.ddms.ddmuilib;bundle-version="22.9.0"
+ com.android.ide.eclipse.base
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/sdkuilib.jar
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties
index 967513964..643fe5ef0 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin_customization.ini,\
                plugin.properties,\
                images/,\
+               libs/,\
                splash.bmp
diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
index 1fa3e6803..36a1bdaec 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
@@ -4,4 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
index eaef08e0f..9eec5f2a7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
@@ -23,11 +23,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.launch,
  com.android.ide.eclipse.adt,
  com.android.ide.eclipse.base,
- com.android.ide.eclipse.ddms,
- com.android.tools.sdk-common;bundle-version="22.9.0",
- com.android.tools.common;bundle-version="22.9.0",
- com.android.tools.ddms.ddmlib;bundle-version="22.9.0",
- com.android.tools.sdklib;bundle-version="22.9.0",
- com.google.guava;bundle-version="15.0.0"
+ com.android.ide.eclipse.ddms
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
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
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath b/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
index 751c8f2e5..30837956d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="lib" path="libs/traceview.jar" sourcepath="/traceview"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
index 0d51d943e..0b061b829 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
  com.android.ide.eclipse.ddms;bundle-version="21.0.0",
  org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- com.android.tools.traceview;bundle-version="22.9.0"
+ org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ libs/traceview.jar
 Bundle-Vendor: The Android Open Source Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties b/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties
index b0c2cc591..8b1b45b59 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties
@@ -2,6 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               libs,\
                plugin.xml,\
                icons/,\
                about.ini,\
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index 301e7c18e..4001d4460 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -87,11 +87,6 @@
                     <url>${target-platform.base.url}/egit</url>
                     <layout>p2</layout>
                 </repository>
-                <repository>
-                    <id>toolsDependencies</id>
-                    <url>file://${ANDROID_OUT}/host/maven/p2gen/repository</url>
-                    <layout>p2</layout>
-                </repository>
             </repositories>
         </profile>
         <profile>
diff --git a/eclipse/scripts/build_adt.sh b/eclipse/scripts/build_adt.sh
index 0c5792c54..7741da6c9 100755
--- a/eclipse/scripts/build_adt.sh
+++ b/eclipse/scripts/build_adt.sh
@@ -36,28 +36,11 @@ echo Running gradle to build tools libraries...
 cd "$ANDROID_SRC"/tools
 ./gradlew --no-daemon publishLocal
 
-# The following step temporarily disabled: we are running maven in online mode, but it
-# actually picks up everything it needs from within the prebuilts or the out folder. The
-# current issue is just in creating a local repository that looks as if it has been
-# initialized by downloading from a remote repository.
-
-# 2. Create a combined m2 repository that has the tools generated in step 1 and other prebuilts
-# This is required so that maven can be run in offline mode in the next step.
-# echo Creating a combined tools + prebuilts maven repo...
-# COMBINED_M2_REPO="$ANDROID_SRC"/out/host/maven/toolsRepo
-# mkdir -p "$COMBINED_M2_REPO"
-# cp -r "$ANDROID_SRC"/out/repo "$COMBINED_M2_REPO"
-# cp -r "$ANDROID_SRC"/prebuilts/tools/common/m2/repository/* "$COMBINED_M2_REPO"
-
-# 3. Convert the generated Maven repository into a p2 repository
-echo Converting maven repo to p2 repo...
-cd "$ANDROID_SRC"/sdk/p2gen
-"$MAVEN" --no-snapshot-updates \
-      -P online \
-      -Dmaven.repo.local=../../out/host/maven/toolsRepo \
-      p2:site
+# 2. Copy dependent jars into the libs folder of each plugin
+cd "$ANDROID_SRC"/sdk/eclipse
+../../tools/gradlew --no-daemon copydeps
 
-# 4. Launch Tycho build
+# 3. Launch Tycho build
 echo Launching Tycho to build ADT plugins and bundle
 cd "$ANDROID_SRC"/sdk/eclipse
 make -f maven.mk