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

Commit 5d125f2b authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Accept zip, jack, jar, and flata extensions as archives"

parents 9b100229 656a577a

tools/aapt2/link/Link.cpp

+4 −1
Original line number Diff line number Diff line
@@ -523,7 +523,10 @@ public: 
    }



    bool processFile(const std::string& path, bool override) {

        if (util::stringEndsWith<char>(path, ".flata")) {

        if (util::stringEndsWith<char>(path, ".flata") ||

                util::stringEndsWith<char>(path, ".jar") ||

                util::stringEndsWith<char>(path, ".jack") ||

                util::stringEndsWith<char>(path, ".zip")) {

            return mergeArchive(path, override);

        }