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

Commit 1677a9bd authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

parents 7377c7be 51cce0ec

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class Main { 
        try {

            CreateInfo info = new CreateInfo();

            Set<String> excludeClasses = getExcludedClasses(info);

            AsmGenerator agen = new AsmGenerator(log, osDestJar[0], info);

            AsmGenerator agen = new AsmGenerator(log, osDestJar, info);



            AsmAnalyzer aa = new AsmAnalyzer(log, osJarPath, agen,

                    new String[] {                          // derived from