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

am 36ee5daf: Merge change 26329 into eclair

Browse Source 
Merge commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp

* commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
  Distinguish jar folders and jar files in ApkBuilder script
This commit is contained in:
Piotr Gurgul
2009-09-22 11:52:04 -07:00
committed by Android Git Automerger
parent d176d42d67 36ee5dafd0
commit b824d51914
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");
}
File f = new File(args[index]);
if (f.isDirectory()) {
processJarFolder(args[index++], resourcesJars);
} else if (f.isFile()) {
processJarFile(args[index++], resourcesJars);
}
} else if ("-nf".equals(argument)) {
// quick check on the next argument.
if (index == args.length) {