diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-10 14:29:11 -0700 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-06-10 15:32:43 -0700 |
| commit | da9cddc36601cc91d13a6256cc24c4c628f2c870 (patch) | |
| tree | 4df1ab26cb8c9a63bc2043e0917329e95a87bada /eclipse/plugins/com.android.ide.eclipse.base/.classpath | |
| parent | f970b9a6676679fdaef6388c44b6575f95bc5875 (diff) | |
| download | sdk-da9cddc36601cc91d13a6256cc24c4c628f2c870.tar.gz sdk-da9cddc36601cc91d13a6256cc24c4c628f2c870.tar.bz2 sdk-da9cddc36601cc91d13a6256cc24c4c628f2c870.zip | |
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
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.base/.classpath')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/.classpath | 14 |
1 files changed, 14 insertions, 0 deletions
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"/> |