commit 9266c558bf1d21ff647525ff99f7dadbca417309
author The Android Open Source Project <initial-contribution@android.com> Thu Jan 15 16:12:10 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Jan 15 16:12:10 2009 -0800
tree 1630b1ba80f4793caf39d865528e662bdb1037fe
parent b798689749c64baba81f02e10cf2157c747d6b46

auto import from //branches/cupcake/...@126645

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 9f75d4b..bff0423 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -761,7 +761,7 @@
     }
 
     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;
@@ -793,7 +793,7 @@
     }
 
     // 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;