Automated import from //branches/cupcake/...@141592,141592

diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java
index d2c7162..6444e4d 100644 (file)
--- a/anttasks/src/com/android/ant/AaptExecLoopTask.java
+++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java
@@ -181,11 +181,14 @@ public final class AaptExecLoopTask extends Task {
         task.createArg().setValue("-M");
         task.createArg().setValue(mManifest);
 
-        // resources location
-        task.createArg().setValue("-S");
-        task.createArg().setValue(mResources);
+        // resources location. This may not exists, and aapt doesn't like it, so we check first.
+        File res = new File(mResources);
+        if (res.isDirectory()) {
+            task.createArg().setValue("-S");
+            task.createArg().setValue(mResources);
+        }
         
-        // assets location. this may not exists, and aapt doesn't like it, so we check first.
+        // assets location. This may not exists, and aapt doesn't like it, so we check first.
         File assets = new File(mAssets);
         if (assets.isDirectory()) {
             task.createArg().setValue("-A");

diff --git a/scripts/android_rules.xml b/scripts/android_rules.xml
index aad9dbd..003021c 100644 (file)
--- a/scripts/android_rules.xml
+++ b/scripts/android_rules.xml
@@ -72,6 +72,7 @@
     <!-- Create the output directories if they don't exist yet. -->
     <target name="dirs">
         <echo>Creating output directories if needed...</echo>
+        <mkdir dir="${resource-folder}" />
         <mkdir dir="${external-libs-folder}" />
         <mkdir dir="${gen-folder}" />
         <mkdir dir="${out-folder}" />