Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-05-13 02:32:30 +00:00
committed by Android (Google) Code Review
parent 7377c7be6a 51cce0ec42
commit 1677a9bdeb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
View File

@@ -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