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

Commit 3921e87e authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Quick fix to ensure mipmap doesn't get stripped by AAPT 

This is a quick fix. A refactoring is already underway to properly
solve this problem.

Bug:14857725
Change-Id: Ic0c475aa0b180803a687904ad9f71eb87e137a25
parent da86f784

tools/aapt/ApkBuilder.h

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ public: 
        return mSplits;

    }



    android::sp<ApkSplit> getBaseSplit() {

        return mSplits[0];

    }



    void print() const;



private:

tools/aapt/Command.cpp

+14 −3
Original line number Diff line number Diff line
@@ -2035,10 +2035,16 @@ bail: 
    return (result != NO_ERROR);

}



static status_t addResourcesToBuilder(const sp<AaptDir>& dir, const sp<ApkBuilder>& builder) {

static status_t addResourcesToBuilder(const sp<AaptDir>& dir, const sp<ApkBuilder>& builder, bool ignoreConfig=false) {

    const size_t numDirs = dir->getDirs().size();

    for (size_t i = 0; i < numDirs; i++) {

        status_t err = addResourcesToBuilder(dir->getDirs().valueAt(i), builder);

        bool ignore = ignoreConfig;

        const sp<AaptDir>& subDir = dir->getDirs().valueAt(i);

        const char* dirStr = subDir->getLeaf().string();

        if (!ignore && strstr(dirStr, "mipmap") == dirStr) {

            ignore = true;

        }

        status_t err = addResourcesToBuilder(subDir, builder, ignore);

        if (err != NO_ERROR) {

            return err;

        }
@@ -2049,7 +2055,12 @@ static status_t addResourcesToBuilder(const sp<AaptDir>& dir, const sp<ApkBuilde 
        sp<AaptGroup> gp = dir->getFiles().valueAt(i);

        const size_t numConfigs = gp->getFiles().size();

        for (size_t j = 0; j < numConfigs; j++) {

            status_t err = builder->addEntry(gp->getPath(), gp->getFiles().valueAt(j));

            status_t err = NO_ERROR;

            if (ignoreConfig) {

                err = builder->getBaseSplit()->addEntry(gp->getPath(), gp->getFiles().valueAt(j));

            } else {

                err = builder->addEntry(gp->getPath(), gp->getFiles().valueAt(j));

            }

            if (err != NO_ERROR) {

                fprintf(stderr, "Failed to add %s (%s) to builder.\n",

                        gp->getPath().string(), gp->getFiles()[j]->getPrintableSource().string());