commit 09384303dea4f3f01d5682918d7bab9bf83a02b1
author Adam Lesinski <adamlesinski@google.com> Wed Jan 22 16:07:42 2014 -0800
committer Adam Lesinski <adamlesinski@google.com> Thu Jan 23 12:43:42 2014 -0800
tree 8b1c7e3e736cd8e2fdc0964ea5c71d08536452eb
parent 6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff

Add support for multiple asset dirs (-A)

Bug: 12608034
Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 632efe0..40845e3 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1896,7 +1896,7 @@
 
     N = bundle->getFileSpecCount();
     if (N < 1 && bundle->getResourceSourceDirs().size() == 0 && bundle->getJarFiles().size() == 0
-            && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) {
+            && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDirs().size() == 0) {
         fprintf(stderr, "ERROR: no input files\n");
         goto bail;
     }