Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cf489c1 authored by Raphael Moll's avatar Raphael Moll Committed by Android Git Automerger
Browse files

am 0f160c95: Merge "Layoutlib Create: Find dependencies." 

* commit '0f160c95':
  Layoutlib Create: Find dependencies.
parents cfe75518 0f160c95

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

+37 −41
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ public class AsmAnalyzer { 
     * 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" : "");
@@ -229,10 +226,9 @@ public class AsmAnalyzer { 
     * 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)) {