diff options
| author | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:16:01 -0800 |
|---|---|---|
| committer | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:16:01 -0800 |
| commit | 0fda766e53fba7e829fe6e145738f6a94ce48bda (patch) | |
| tree | fdca3dc04f5dce55978b3ef6016c1042b9d675e5 /tools/aapt/Command.cpp | |
| parent | 562bb3db4f4475f5d933877d428097a6d1203605 (diff) | |
| parent | 9266c558bf1d21ff647525ff99f7dadbca417309 (diff) | |
| download | frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.zip frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.tar.gz frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.tar.bz2 | |
Merge branch 'cupcake'
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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; |