Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa888784 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

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

Merge commit '89fef418' into gingerbread-plus-aosp

* commit '89fef418':
  Avoid pre-processing images when they won't be used
parents e3dabc4b 89fef418

tools/aapt/Resource.cpp

+3 −1
Original line number Diff line number Diff line
@@ -835,7 +835,9 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) 
    bool hasErrors = false;



    if (drawables != NULL) {

        if (bundle->getOutputAPKFile() != NULL) {

            err = preProcessImages(bundle, assets, drawables);

        }

        if (err == NO_ERROR) {

            err = makeFileResources(bundle, assets, &table, drawables, "drawable");

            if (err != NO_ERROR) {