diff options
| -rw-r--r-- | tools/layoutlib/bridge/bridge.iml | 2 | ||||
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/layoutlib/bridge/bridge.iml b/tools/layoutlib/bridge/bridge.iml index af2fe7fc0a30..ccc10b325b77 100644 --- a/tools/layoutlib/bridge/bridge.iml +++ b/tools/layoutlib/bridge/bridge.iml @@ -46,7 +46,7 @@ </CLASSES> <JAVADOC /> <SOURCES> - <root url="file://$ANDROID_SRC$/tools/base/common/src/main/java" /> + <root url="jar://$MODULE_DIR$/../../../../../prebuilts/misc/common/tools-common/tools-common-prebuilt-sources.jar!/" /> </SOURCES> </library> </orderEntry> diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java index dae5509f2aa3..f6c2626e4271 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java @@ -94,8 +94,14 @@ public class AsmGenerator { ListIterator<Class<?>> iter = injectedClasses.listIterator(); while (iter.hasNext()) { Class<?> clazz = iter.next(); - for (Class<?> aClass : clazz.getDeclaredClasses()) { - iter.add(aClass); + try { + int i = 1; + while(i < 100) { + iter.add(Class.forName(clazz.getName() + "$" + i)); + i++; + } + } catch (ClassNotFoundException ignored) { + // Expected. } } mInjectClasses = injectedClasses.toArray(new Class<?>[0]); |