Merge commit 'remotes/korg/cupcake' into merge

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 9f75d4bec4ad98d7ac8c4209aa420f787b5959e9..bff0423c45c5fd5f50b84ed3b3dd0a643e1e4372 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -761,7 +761,7 @@ int doPackage(Bundle* bundle)
     }
 
     N = bundle->getFileSpecCount();
     }
 
     N = bundle->getFileSpecCount();

-    if (N < 1 && bundle->getResourceSourceDir() == NULL && bundle->getJarFiles().size() == 0
+    if (N < 1 && bundle->getResourceSourceDirs().size() == 0 && bundle->getJarFiles().size() == 0

             && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) {
         fprintf(stderr, "ERROR: no input files\n");
         goto bail;
             && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) {
         fprintf(stderr, "ERROR: no input files\n");
         goto bail;


@@ -793,7 +793,7 @@ int doPackage(Bundle* bundle)
     }
 
     // If they asked for any files that need to be compiled, do so.
     }
 
     // If they asked for any files that need to be compiled, do so.

-    if (bundle->getResourceSourceDir() || bundle->getAndroidManifestFile()) {
+    if (bundle->getResourceSourceDirs().size() || bundle->getAndroidManifestFile()) {

         err = buildResources(bundle, assets);
         if (err != 0) {
             goto bail;
         err = buildResources(bundle, assets);
         if (err != 0) {
             goto bail;