diff options
| author | 2014-02-04 18:36:10 +0000 | |
|---|---|---|
| committer | 2014-02-04 18:36:10 +0000 | |
| commit | 1b5b60d696dd6840406ab9d3f38522ba18273c60 (patch) | |
| tree | 1c6896b824a4f9bcf2b8960048f53d4713929d70 /tools/aapt/Command.cpp | |
| parent | 1441acdd6d0f08b00493478386e1b74df47e243b (diff) | |
| parent | 203356a34a82bfc759be02dfa1caa4529dce0732 (diff) | |
am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
Add support for multiple asset dirs (-A)
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 8a6faed585a2..5d4232d97537 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; } |