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

Commit 86768034 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and... 

am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

* commit 'b593ad60':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
parents f99fc540 b593ad60

tools/aapt/ResourceTable.cpp

+15 −0
Original line number Diff line number Diff line
@@ -865,6 +865,21 @@ status_t compileResourceFile(Bundle* bundle, 
        pseudoBidiParams.country[0] = 'X';

        pseudoBidiParams.country[1] = 'B';



    // We should skip resources for pseudolocales if they were

    // already added automatically. This is a fix for a transition period when

    // manually pseudolocalized resources may be expected.

    // TODO: remove this check after next SDK version release.

    if ((bundle->getPseudolocalize() & PSEUDO_ACCENTED &&

         curParams.locale == pseudoParams.locale) ||

        (bundle->getPseudolocalize() & PSEUDO_BIDI &&

         curParams.locale == pseudoBidiParams.locale)) {

        SourcePos(in->getPrintableSource(), 0).warning(

                "Resource file %s is skipped as pseudolocalization"

                " was done automatically.",

                in->getPrintableSource().string());

        return NO_ERROR;

    }



    while ((code=block.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {

        if (code == ResXMLTree::START_TAG) {

            const String16* curTag = NULL;