From 666d24cc3c9c35e5d7fd925622b9eb3f478f0cdd Mon Sep 17 00:00:00 2001 From: Piotr Gurgul Date: Mon, 21 Sep 2009 21:02:00 -0700 Subject: [PATCH] Distinguish jar folders and jar files in ApkBuilder script Checking if -rj parameter value is a directory or a file and calling the appropriate function for each of them. --- .../com/android/apkbuilder/internal/ApkBuilderImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java b/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java index 81cbc1ccb..9d21c2259 100644 --- a/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java +++ b/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java @@ -133,7 +133,12 @@ public final class ApkBuilderImpl { throw new WrongOptionException("Missing value for -rj"); } - processJarFolder(args[index++], resourcesJars); + 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) {