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

Commit 51cce0ec authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

resolve conflicts for merge 5a7b3b65 correctly 

Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
parent 8a70bcef

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