ApkBuilderTask is now more lenient with missing libs/ folders.

Change-Id: Ic40c35e7074a91fb40094d3c5e5a605ff1ea2fef

1 files changed, 11 insertions, 3 deletions

diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java
index 9e3c8e4..f73739b 100644
--- a/anttasks/src/com/android/ant/ApkBuilderTask.java
+++ b/anttasks/src/com/android/ant/ApkBuilderTask.java
@@ -254,7 +254,11 @@ public class ApkBuilderTask extends Task {
             // now go through the list of jar folders.
             for (Path pathList : mJarfolderList) {
                 for (String path : pathList.list()) {
-                    ApkBuilderImpl.processJar(new File(path), mResourcesJars);
+                    // it's ok if top level folders are missing
+                    File folder = new File(path);
+                    if (folder.isDirectory()) {
+                        ApkBuilderImpl.processJar(folder, mResourcesJars);
+                    }
                 }
             }
 
@@ -268,8 +272,12 @@ public class ApkBuilderTask extends Task {
             // now the native lib folder.
             for (Path pathList : mNativeList) {
                 for (String path : pathList.list()) {
-                    ApkBuilderImpl.processNativeFolder(new File(path), mDebug,
-                            mNativeLibraries, mVerbose, mAbiFilter);
+                    // it's ok if top level folders are missing
+                    File folder = new File(path);
+                    if (folder.isDirectory()) {
+                        ApkBuilderImpl.processNativeFolder(folder, mDebug,
+                                mNativeLibraries, mVerbose, mAbiFilter);
+                    }
                 }
             }