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

Commit 6ee44d1f authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 1258 into donut 

* changes:
  Fix 1840639 to support overlays with zz_ZZ. Everything but strings worked fine before but a new default string would generate a build error.
parents 1655be46 32c2c902

tools/aapt/ResourceTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ status_t compileResourceFile(Bundle* bundle, 
                        // pseudolocalize here

                        block.setPosition(parserPosition);

                        err = parseAndAddEntry(bundle, in, &block, pseudoParams, myPackage, curType,

                                ident, *curTag, curIsStyled, curFormat, true, false, outTable);

                                ident, *curTag, curIsStyled, curFormat, true, overwrite, outTable);

                        if (err != NO_ERROR) {

                            hasErrors = localHasErrors = true;

                        }