diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-10-23 18:40:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-23 18:40:25 +0000 |
| commit | 68cb323e9d324a1eb4d22906fd372908d211643b (patch) | |
| tree | 1e65e4ca71741e59dd87f600d656910721e8bcc1 | |
| parent | 3097ff46b037b80d8f2b974f7de16964c4fe0a07 (diff) | |
| parent | fab56d81bbe629b2c7858a60fdef7c8922b03a0b (diff) | |
| download | platform_sdk-tools_r22.2.tar.gz platform_sdk-tools_r22.2.tar.bz2 platform_sdk-tools_r22.2.zip | |
Merge "Fix target parser" into tools_r22.2tools_r22.2
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java index c4eb37fb5..754cedf79 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java @@ -251,7 +251,16 @@ public class AndroidJarLoader extends ClassLoader implements IAndroidClassLoader } data = readZipData(zis, (int)entrySize); } - loaded_class = defineAndCacheClass(className, data); + try { + loaded_class = defineAndCacheClass(className, data); + } catch (NoClassDefFoundError error) { + if (error.getMessage().startsWith("java/")) { + // Can't define these; we just need to stop + // iteration here + continue; + } + throw error; + } } for (Class<?> superClass = loaded_class.getSuperclass(); |