From da9cddc36601cc91d13a6256cc24c4c628f2c870 Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Tue, 10 Jun 2014 14:29:11 -0700 Subject: 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 --- eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties') diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties b/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties index c446f3c..4f3d57a 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, -- cgit v1.1