drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1258 into donut

Browse Source 
* 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.
This commit is contained in:
Android (Google) Code Review
2009-05-11 11:19:49 -07:00
parent 1655be46d2 32c2c90220
commit 6ee44d1ff3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/ResourceTable.cpp
View File

@ -1225,7 +1225,7 @@ status_t compileResourceFile(Bundle* bundle,
// pseudolocalize here // pseudolocalize here
block.setPosition(parserPosition); block.setPosition(parserPosition);
err = parseAndAddEntry(bundle, in, &block, pseudoParams, myPackage, curType, 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) { if (err != NO_ERROR) {
hasErrors = localHasErrors = true; hasErrors = localHasErrors = true;
} }