summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 17:53:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 17:53:55 +0000
commitbd5a3e6510e83b161a0e40c191d349524ae4a8e6 (patch)
tree108b74a37137a498820c0aaa7d6d4f9c35186b61 /tools
parent0ad4f2cedde037c2b09a7f09c5f95f0984267c64 (diff)
parent1677a9bdeba3961625236925e754920fca1b7e89 (diff)
downloadframeworks_base-bd5a3e6510e83b161a0e40c191d349524ae4a8e6.zip
frameworks_base-bd5a3e6510e83b161a0e40c191d349524ae4a8e6.tar.gz
frameworks_base-bd5a3e6510e83b161a0e40c191d349524ae4a8e6.tar.bz2
am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '1677a9bdeba3961625236925e754920fca1b7e89': resolve conflicts for merge 5a7b3b65 correctly
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
index 964e2f3..28cd023 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
@@ -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