drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
The Android Open Source Project
2009-01-15 16:12:10 -08:00
parent b798689749
commit 9266c558bf
326 changed files with 11994 additions and 2045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/Command.cpp
View File

@ -761,7 +761,7 @@ int doPackage(Bundle* bundle)
}
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 @@ int doPackage(Bundle* bundle)
}
// 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;