Merge "Layoutlib Create: Find dependencies."

Author: ralf-at-android

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

@@ -45,7 +45,7 @@
 public class AsmAnalyzer {
 
     // Note: a bunch of stuff has package-level access for unit tests. Consider it private.
-    
+
     /** Output logger. */
     private final Log mLog;
     /** The input source JAR to parse. */
@@ -59,11 +59,11 @@ public class AsmAnalyzer {
 
     /**
      * Creates a new analyzer.
-     * 
+     *
      * @param log The log output.
      * @param osJarPath The input source JARs to parse.
      * @param gen The generator to fill with the class list and dependency list.
-     * @param deriveFrom Keep all classes that derive from these one (these included). 
+     * @param deriveFrom Keep all classes that derive from these one (these included).
      * @param includeGlobs Glob patterns of classes to keep, e.g. "com.foo.*"
      *        ("*" does not matches dots whilst "**" does, "." and "$" are interpreted as-is)
      */
@@ -81,16 +81,13 @@ public AsmAnalyzer(Log log, List<String> osJarPath, AsmGenerator gen,
      * Fills the generator with classes & dependencies found.
      */
     public void analyze() throws IOException, LogAbortException {
-
-        AsmAnalyzer visitor = this;
-        
         Map<String, ClassReader> zipClasses = parseZip(mOsSourceJar);
         mLog.info("Found %d classes in input JAR%s.", zipClasses.size(),
                 mOsSourceJar.size() > 1 ? "s" : "");
-        
+
         Map<String, ClassReader> found = findIncludes(zipClasses);
         Map<String, ClassReader> deps = findDeps(zipClasses, found);
-        
+
         if (mGen != null) {
             mGen.setKeep(found);
             mGen.setDeps(deps);
@@ -117,10 +114,10 @@ Map<String,ClassReader> parseZip(List<String> jarPathList) throws IOException {
                 }
             }
         }
-        
+
         return classes;
     }
-    
+
     /**
      * Utility that returns the fully qualified binary class name for a ClassReader.
      * E.g. it returns something like android.view.View.
@@ -132,7 +129,7 @@ static String classReaderToClassName(ClassReader classReader) {
             return classReader.getClassName().replace('/', '.');
         }
     }
-    
+
     /**
      * Utility that returns the fully qualified binary class name from a path-like FQCN.
      * E.g. it returns android.view.View from android/view/View.
@@ -144,7 +141,7 @@ static String internalToBinaryClassName(String className) {
             return className.replace('/', '.');
         }
     }
-    
+
     /**
      * Process the "includes" arrays.
      * <p/>
@@ -162,11 +159,11 @@ Map<String, ClassReader> findIncludes(Map<String, ClassReader> zipClasses)
         for (String s : mDeriveFrom) {
             findClassesDerivingFrom(s, zipClasses, found);
         }
-        
+
         return found;
     }
 
-    
+
     /**
      * Uses ASM to find the class reader for the given FQCN class name.
      * If found, insert it in the in_out_found map.
@@ -215,7 +212,7 @@ void findGlobs(String globPattern, Map<String, ClassReader> zipClasses,
         globPattern += "$";
 
         Pattern regexp = Pattern.compile(globPattern);
-        
+
         for (Entry<String, ClassReader> entry : zipClasses.entrySet()) {
             String class_name = entry.getKey();
             if (regexp.matcher(class_name).matches()) {
@@ -229,10 +226,9 @@ void findGlobs(String globPattern, Map<String, ClassReader> zipClasses,
      * determine if they are derived from the given FQCN super class name.
      * Inserts the super class and all the class objects found in the map.
      */
-    void findClassesDerivingFrom(String super_name, Map<String, ClassReader> zipClasses,
-            Map<String, ClassReader> inOutFound) throws LogAbortException {
-        ClassReader super_clazz = findClass(super_name, zipClasses, inOutFound);
-
+    void findClassesDerivingFrom(String super_name,
+            Map<String, ClassReader> zipClasses,
+            Map<String, ClassReader> inOutFound) {
         for (Entry<String, ClassReader> entry : zipClasses.entrySet()) {
             String className = entry.getKey();
             if (super_name.equals(className)) {
@@ -284,7 +280,7 @@ Map<String, ClassReader> findDeps(Map<String, ClassReader> zipClasses,
         for (ClassReader cr : inOutKeepClasses.values()) {
             cr.accept(visitor, 0 /* flags */);
         }
-        
+
         while (new_deps.size() > 0 || new_keep.size() > 0) {
             deps.putAll(new_deps);
             inOutKeepClasses.putAll(new_keep);
@@ -308,12 +304,12 @@ Map<String, ClassReader> findDeps(Map<String, ClassReader> zipClasses,
         return deps;
     }
 
-    
+
 
     // ----------------------------------
-    
+
     /**
-     * Visitor to collect all the type dependencies from a class. 
+     * Visitor to collect all the type dependencies from a class.
      */
     public class DependencyVisitor
         implements ClassVisitor, FieldVisitor, MethodVisitor, SignatureVisitor, AnnotationVisitor {
@@ -333,7 +329,7 @@ public class DependencyVisitor
          * Creates a new visitor that will find all the dependencies for the visited class.
          * Types which are already in the zipClasses, keepClasses or inDeps are not marked.
          * New dependencies are marked in outDeps.
-         * 
+         *
          * @param zipClasses All classes found in the source JAR.
          * @param inKeep Classes from which dependencies are to be found.
          * @param inDeps Dependencies already known.
@@ -350,7 +346,7 @@ public DependencyVisitor(Map<String, ClassReader> zipClasses,
             mInDeps = inDeps;
             mOutDeps = outDeps;
         }
-        
+
         /**
          * Considers the given class name as a dependency.
          * If it does, add to the mOutDeps map.
@@ -361,7 +357,7 @@ public void considerName(String className) {
             }
 
             className = internalToBinaryClassName(className);
-            
+
             // exclude classes that have already been found
             if (mInKeep.containsKey(className) ||
                     mOutKeep.containsKey(className) ||
@@ -384,7 +380,7 @@ public void considerName(String className) {
             } catch (ClassNotFoundException e) {
                 // ignore
             }
-            
+
             // accept this class:
             // - android classes are added to dependencies
             // - non-android classes are added to the list of classes to keep as-is (they don't need
@@ -395,7 +391,7 @@ public void considerName(String className) {
                 mOutKeep.put(className, cr);
             }
         }
-        
+
         /**
          * Considers this array of names using considerName().
          */
@@ -450,7 +446,7 @@ public void considerDesc(String desc) {
             }
         }
 
-        
+
         // ---------------------------------------------------
         // --- ClassVisitor, FieldVisitor
         // ---------------------------------------------------
@@ -460,15 +456,15 @@ public void visit(int version, int access, String name,
                 String signature, String superName, String[] interfaces) {
             // signature is the signature of this class. May be null if the class is not a generic
             // one, and does not extend or implement generic classes or interfaces.
-            
+
             if (signature != null) {
                 considerSignature(signature);
             }
 
             // superName is the internal of name of the super class (see getInternalName).
             // For interfaces, the super class is Object. May be null but only for the Object class.
             considerName(superName);
-            
+
             // interfaces is the internal names of the class's interfaces (see getInternalName).
             // May be null.
             considerNames(interfaces);
@@ -513,7 +509,7 @@ public MethodVisitor visitMethod(int access, String name, String desc,
             // signature is the method's signature. May be null if the method parameters, return
             // type and exceptions do not use generic types.
             considerSignature(signature);
-            
+
             return this; // returns this to visit the method
         }
 
@@ -525,7 +521,7 @@ public void visitSource(String source, String debug) {
             // pass
         }
 
-        
+
         // ---------------------------------------------------
         // --- MethodVisitor
         // ---------------------------------------------------
@@ -601,7 +597,7 @@ public void visitMaxs(int maxStack, int maxLocals) {
 
         // instruction that invokes a method
         public void visitMethodInsn(int opcode, String owner, String name, String desc) {
-            
+
             // owner is the internal name of the method's owner class
             considerName(owner);
             // desc is the method's descriptor (see Type).
@@ -610,7 +606,7 @@ public void visitMethodInsn(int opcode, String owner, String name, String desc)
 
         // instruction multianewarray, whatever that is
         public void visitMultiANewArrayInsn(String desc, int dims) {
-            
+
             // desc an array type descriptor.
             considerDesc(desc);
         }
@@ -624,7 +620,7 @@ public AnnotationVisitor visitParameterAnnotation(int parameter, String desc,
 
         public void visitTableSwitchInsn(int min, int max, Label dflt, Label[] labels) {
             // pass -- table switch instruction
-            
+
         }
 
         public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
@@ -641,10 +637,10 @@ public void visitTypeInsn(int opcode, String type) {
         }
 
         public void visitVarInsn(int opcode, int var) {
-            // pass -- local variable instruction 
+            // pass -- local variable instruction
         }
 
-        
+
         // ---------------------------------------------------
         // --- SignatureVisitor
         // ---------------------------------------------------
@@ -716,8 +712,8 @@ public void visitTypeVariable(String name) {
         public void visitTypeArgument() {
             // pass
         }
-        
-        
+
+
         // ---------------------------------------------------
         // --- AnnotationVisitor
         // ---------------------------------------------------
@@ -746,6 +742,6 @@ public void visitEnum(String name, String desc, String value) {
             // desc is the class descriptor of the enumeration class.
             considerDesc(desc);
         }
-        
+
     }
 }