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

Commit 72bd79d1 authored by Alexandria Cornwall's avatar Alexandria Cornwall Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Convert StringPool flattening to UTF-8"

parents f2e0883c e0af925c

tools/aapt2/flatten/TableFlattener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public: 
        StringPool::flattenUtf16(pkgWriter.getBuffer(), mTypePool);



        pkgHeader->keyStrings = util::hostToDevice32(pkgWriter.size());

        StringPool::flattenUtf16(pkgWriter.getBuffer(), mKeyPool);

        StringPool::flattenUtf8(pkgWriter.getBuffer(), mKeyPool);



        // Append the types.

        buffer->appendBuffer(std::move(typeBuffer));

tools/aapt2/flatten/XmlFlattener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ bool XmlFlattener::flatten(IAaptContext* context, xml::Node* node) { 
    xmlHeaderWriter.startChunk<ResXMLTree_header>(RES_XML_TYPE);



    // Flatten the StringPool.

    StringPool::flattenUtf16(mBuffer, visitor.mPool);

    StringPool::flattenUtf8(mBuffer, visitor.mPool);



    {

        // Write the array of resource IDs, indexed by StringPool order.