Merge "Avoid pre-processing images when they won't be used"

This commit is contained in:
Xavier Ducrohet
2010-09-09 18:30:59 -07:00
committed by Android Code Review

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) {