Merge "Avoid pre-processing images when they won't be used" into gingerbread
This commit is contained in:
committed by
Android (Google) Code Review
commit
4e1658afb8
@@ -835,7 +835,9 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
|
|||||||
bool hasErrors = false;
|
bool hasErrors = false;
|
||||||
|
|
||||||
if (drawables != NULL) {
|
if (drawables != NULL) {
|
||||||
err = preProcessImages(bundle, assets, drawables);
|
if (bundle->getOutputAPKFile() != NULL) {
|
||||||
|
err = preProcessImages(bundle, assets, drawables);
|
||||||
|
}
|
||||||
if (err == NO_ERROR) {
|
if (err == NO_ERROR) {
|
||||||
err = makeFileResources(bundle, assets, &table, drawables, "drawable");
|
err = makeFileResources(bundle, assets, &table, drawables, "drawable");
|
||||||
if (err != NO_ERROR) {
|
if (err != NO_ERROR) {
|
||||||
|
|||||||
Reference in New Issue
Block a user