Replace bundled libraries with OSGI bundle dependencies
This CL removes all the jars bundled in inside the libs
folder and adds explicit dependencies on OSGI bundles
for each of the dependencies.
See eec615b94b504de6d87702b830a6fc85fc7d5108 for more
info on how the dependency jars are converted into
OSGI bundles.
Change-Id: I5356edc2ca857ea961392c599fa0e985b16b4b2d
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index d6e4c2e..10b4873 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -3,20 +3,5 @@
<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.19.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
index d392f0e..c944794 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
@@ -1 +1,2 @@
*.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 8755d41..a5b9799 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
@@ -51,11 +51,32 @@
org.eclipse.ltk.core.refactoring,
org.eclipse.ltk.ui.refactoring,
org.eclipse.core.expressions,
- org.eclipse.compare
+ 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"
Bundle-ActivationPolicy: lazy
-Export-Package: com.android.assetstudiolib;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.common.api;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests",
+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",
com.android.ide.common.layout.relative;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.common.resources.platform;x-friends:="com.android.ide.eclipse.tests",
@@ -119,22 +140,7 @@
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.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"
+ com.android.ide.eclipse.adt.io;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/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.adt/libs/.gitignore
deleted file mode 100644
index d392f0e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
index b5eb7e1..ad32c83 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
@@ -1,19 +1,5 @@
<?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 4b3720e..6dcdaae 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,137 +4,10 @@
Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true
Bundle-Version: 22.6.2.qualifier
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ com.android.tools.sdkstats;bundle-version="22.9.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: The Android Open Source Project
-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,
- libs/bcpkix-jdk15on-1.48.jar,
- libs/bcprov-jdk15on-1.48.jar
-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
+Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: com.android.ide.eclipse.base
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore
deleted file mode 100644
index d392f0e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.base/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
index a51b125..751c8f2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/.classpath
@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="libs/uiautomatorviewer.jar" sourcepath="/uiautomatorviewer/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 exported="true" kind="lib" path="libs/ddmlib.jar" sourcepath="/ddmlib"/>
- <classpathentry exported="true" kind="lib" path="libs/ddmuilib.jar" sourcepath="/ddmuilib"/>
- <classpathentry kind="lib" path="libs/jfreechart-swt-1.0.9.jar"/>
<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 8b0389a..fc1e63a 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,32 +12,16 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.eclipse.core.filesystem,
- com.android.ide.eclipse.base
+ 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"
Bundle-ActivationPolicy: lazy
-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,
+Export-Package: 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: .,
- 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-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore
deleted file mode 100644
index d392f0e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
index b3968a7..ad32c83 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/.classpath
@@ -3,6 +3,5 @@
<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="/plugin-gldebugger/libs/host-libprotobuf-java-2.3.0-lite.jar"/>
<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 119da28..bf5248c 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,4 +7,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
+ org.junit;bundle-version="4.11.0";resolution:=optional,
+ com.android.tools.external.libprotobuf-java-lite;bundle-version="2.3.0"
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
index 59d5fe5..1fa3e68 100755
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/.classpath
@@ -3,9 +3,5 @@
<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.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/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
index 645e5c5..1c1b304 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,7 +11,13 @@
org.eclipse.core.filesystem,
org.eclipse.ui.console,
com.android.ide.eclipse.ddms,
- com.android.ide.eclipse.base
+ 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"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: libs/host-libprotobuf-java-2.3.0-lite.jar,
libs/liblzf.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
index 7dccd1f..1fa3e68 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
@@ -3,8 +3,5 @@
<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/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index 958dad3..59295ae 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,8 +11,10 @@
org.eclipse.core.runtime,
org.eclipse.ui.console,
com.android.ide.eclipse.ddms,
- com.android.ide.eclipse.base
-Bundle-ClassPath: .,
- libs/hierarchyviewer2lib.jar
+ 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: .
Export-Package: com.android.ide.eclipse.hierarchyviewer
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/libs/.gitignore
deleted file mode 100644
index f23b948..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
index 1be4b68..1fa3e68 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/.classpath
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar"/>
<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 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 f533e2b..64078a1 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,10 +8,15 @@
org.eclipse.core.runtime,
com.android.ide.eclipse.ddms,
com.android.ide.eclipse.traceview,
- com.android.ide.eclipse.base
+ 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"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: .,
- libs/sdkuilib.jar
+Bundle-ClassPath: .
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 a2a2a99..44471de 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/build.properties
@@ -7,5 +7,4 @@
plugin_customization.ini,\
plugin.properties,\
images/,\
- splash.bmp,\
- libs/sdkuilib.jar
+ splash.bmp
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.monitor/libs/.gitignore
deleted file mode 100644
index d392f0e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
index 58a22d6..1fa3e68 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
@@ -3,8 +3,5 @@
<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 combineaccessrules="false" kind="src" path="/ddmlib"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/>
- <classpathentry combineaccessrules="false" kind="src" path="/sdklib"/>
<classpathentry kind="output" path="bin"/>
</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 9eec5f2..eaef08e 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,6 +23,11 @@
org.eclipse.cdt.launch,
com.android.ide.eclipse.adt,
com.android.ide.eclipse.base,
- com.android.ide.eclipse.ddms
+ 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"
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 cce7e3c..118e6b4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -4,21 +4,5 @@
<classpathentry kind="src" path="unittests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <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"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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 fc2c927..75a39f8 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,12 +5,7 @@
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
+Require-Bundle: org.junit,
+ com.android.tools.testutils;bundle-version="22.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: kxml2-2.3.0.jar,
- .,
- testutils.jar,
- layoutlib.jar,
- lint-api.jar,
- lint-checks.jar,
- easymock.jar
+Bundle-ClassPath: .
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index e8daa3e..186753b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
@@ -6,13 +6,7 @@
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/,\
- easymock.jar
+ unittests/com/android/ide/eclipse/testdata/
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath b/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
index 176babf..751c8f2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="libs/traceview.jar" sourcepath="/traceview"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
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 0b061b8..0d51d94 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 @@
org.eclipse.ui.ide,
com.android.ide.eclipse.ddms;bundle-version="21.0.0",
org.eclipse.core.filesystem,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ com.android.tools.traceview;bundle-version="22.9.0"
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- libs/traceview.jar
+Bundle-ClassPath: .
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 f529710..b0c2cc5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/build.properties
@@ -3,7 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- libs/traceview.jar,\
icons/,\
about.ini,\
about.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.traceview/libs/.gitignore
deleted file mode 100644
index d392f0e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar