diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-04 18:31:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-04 18:31:23 +0000 |
| commit | 203356a34a82bfc759be02dfa1caa4529dce0732 (patch) | |
| tree | b7fbcede2c4901a2099de6a6a0cae86e8fced51d /tools/aapt/Command.cpp | |
| parent | 6dea46b2e567f614244100f542dce04e44c26bee (diff) | |
| parent | 09384303dea4f3f01d5682918d7bab9bf83a02b1 (diff) | |
| download | frameworks_base-203356a34a82bfc759be02dfa1caa4529dce0732.zip frameworks_base-203356a34a82bfc759be02dfa1caa4529dce0732.tar.gz frameworks_base-203356a34a82bfc759be02dfa1caa4529dce0732.tar.bz2 | |
Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 8a6faed..5d4232d 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1896,7 +1896,7 @@ int doPackage(Bundle* bundle) 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; } |