LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am b824d519: am 36ee5daf: Merge change 26329 into eclair

Browse Source 
Merge commit 'b824d519146a813dff72f4baa4a1c7abbf78b962'

* commit 'b824d519146a813dff72f4baa4a1c7abbf78b962':
  Distinguish jar folders and jar files in ApkBuilder script
This commit is contained in:
Piotr Gurgul
2009-09-23 11:29:52 -07:00
committed by Android Git Automerger
parent a9841ee872 b824d51914
commit 221bc2dd35
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
View File

@@ -133,7 +133,12 @@ public final class ApkBuilderImpl {
throw new WrongOptionException("Missing value for -rj"); throw new WrongOptionException("Missing value for -rj");
} }
File f = new File(args[index]);
if (f.isDirectory()) {
processJarFolder(args[index++], resourcesJars); processJarFolder(args[index++], resourcesJars);
} else if (f.isFile()) {
processJarFile(args[index++], resourcesJars);
}
} else if ("-nf".equals(argument)) { } else if ("-nf".equals(argument)) {
// quick check on the next argument. // quick check on the next argument.
if (index == args.length) { if (index == args.length) {