diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-09-10 15:01:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 15:01:56 -0700 |
| commit | f14fafdb7d107b1303e6c93e54b20d457195dca2 (patch) | |
| tree | a112f3032693ee0c9638c777d341bb82a23e7280 /tools/aapt | |
| parent | 5d77928f328feefe0ba15fd12c5b0b9a54b89519 (diff) | |
| parent | fa8887848e2877dd96e853dfcd52086f1b66c26b (diff) | |
| download | frameworks_base-f14fafdb7d107b1303e6c93e54b20d457195dca2.zip frameworks_base-f14fafdb7d107b1303e6c93e54b20d457195dca2.tar.gz frameworks_base-f14fafdb7d107b1303e6c93e54b20d457195dca2.tar.bz2 | |
am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'
* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
Avoid pre-processing images when they won't be used
Diffstat (limited to 'tools/aapt')
| -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 01728a1..822262e 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) { |