summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-08-26 20:20:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 20:20:05 +0000
commite4acf0ad4a83b22ea0ac4ecc23b41864df84714a (patch)
tree8723879af10029840eff6d71588cf922fd574c9f /tools
parent7911c8b97d1c11de96e5fe3495d5e3cb979d0f9f (diff)
parentad16968d506840a1c1824c4ab6b5c181c8e04086 (diff)
downloadframeworks_base-e4acf0ad4a83b22ea0ac4ecc23b41864df84714a.zip
frameworks_base-e4acf0ad4a83b22ea0ac4ecc23b41864df84714a.tar.gz
frameworks_base-e4acf0ad4a83b22ea0ac4ecc23b41864df84714a.tar.bz2
am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit 'ad16968d506840a1c1824c4ab6b5c181c8e04086': LayoutLib: Skip classes from java package. [DO NOT MERGE]
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java4
1 files changed, 3 insertions, 1 deletions
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 @@ public class DependencyFinder {
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) {