commit e4acf0ad4a83b22ea0ac4ecc23b41864df84714a
author Deepanshu Gupta <deepanshu@google.com> Wed Aug 26 20:20:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 20:20:05 2015 +0000
tree 8723879af10029840eff6d71588cf922fd574c9f
parent 7911c8b97d1c11de96e5fe3495d5e3cb979d0f9f
parent ad16968d506840a1c1824c4ab6b5c181c8e04086

am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit 'ad16968d506840a1c1824c4ab6b5c181c8e04086':
  LayoutLib: Skip classes from java package. [DO NOT MERGE]

tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java

diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java
index 7690fcd..61b64a2 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java
@@ -307,7 +307,9 @@
 
             try {
                 // exclude classes that are part of the default JRE (the one executing this program)
-                if (getClass().getClassLoader().loadClass(className) != null) {
+                // or in java package (we won't be able to load them anyway).
+                if (className.startsWith("java.") ||
+                        getClass().getClassLoader().loadClass(className) != null) {
                     return;
                 }
             } catch (ClassNotFoundException e) {