diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-09-10 13:03:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 13:03:43 -0700 |
| commit | fa8887848e2877dd96e853dfcd52086f1b66c26b (patch) | |
| tree | 923ad4607189c83780383ae6a69c06d3cfb7380c /tools | |
| parent | e3dabc4bc4ad977d8b126e644e4328e70bd58b72 (diff) | |
| parent | 89fef4183a3c58aebbbf66e894bbdc1ae9f634e9 (diff) | |
| download | frameworks_base-fa8887848e2877dd96e853dfcd52086f1b66c26b.zip frameworks_base-fa8887848e2877dd96e853dfcd52086f1b66c26b.tar.gz frameworks_base-fa8887848e2877dd96e853dfcd52086f1b66c26b.tar.bz2 | |
am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp
* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
Avoid pre-processing images when they won't be used
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Resource.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 9c5fcda..c8ba904 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -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) { |