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

3 files changed, 4 insertions, 146 deletions

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-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
+ 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