Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

Browse Source 
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
  Avoid pre-processing images when they won't be used
This commit is contained in:
Xavier Ducrohet
2010-09-10 13:03:43 -07:00
committed by Android Git Automerger
parent e3dabc4bc4 89fef4183a
commit fa8887848e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/Resource.cpp
View File

@@ -835,7 +835,9 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
bool hasErrors = false;
if (drawables != NULL) {
err = preProcessImages(bundle, assets, drawables);
if (bundle->getOutputAPKFile() != NULL) {
err = preProcessImages(bundle, assets, drawables);
}
if (err == NO_ERROR) {
err = makeFileResources(bundle, assets, &table, drawables, "drawable");
if (err != NO_ERROR) {