am 8cde8cff: Merge "Fix target parser"

* commit '8cde8cff9fca28dd05bdfd5e1312a4ec5c77a663':
  Fix target parser

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 c4eb37f..754cedf 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();