X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/d38cd880626e1508ffec8d891a8e61b8f5c8cb7d..22eef02a610c68826316e5ace7901f17a37b5c13:/ResourceTable.cpp diff --git a/ResourceTable.cpp b/ResourceTable.cpp index 85665e0..755b93b 100644 --- a/ResourceTable.cpp +++ b/ResourceTable.cpp @@ -13,7 +13,6 @@ #include #define NOISY(x) //x -#define NOISY_REF(x) //x status_t compileXmlFile(const sp& assets, const sp& target, @@ -574,6 +573,7 @@ status_t parseAndAddBag(Bundle* bundle, const String16& parentIdent, const String16& itemIdent, int32_t curFormat, + bool isFormatted, bool pseudolocalize, const bool overwrite, ResourceTable* outTable) @@ -584,7 +584,7 @@ status_t parseAndAddBag(Bundle* bundle, String16 str; Vector spans; err = parseStyledString(bundle, in->getPrintableSource().string(), - block, item16, &str, &spans, + block, item16, &str, &spans, isFormatted, pseudolocalize); if (err != NO_ERROR) { return err; @@ -617,6 +617,7 @@ status_t parseAndAddEntry(Bundle* bundle, const String16& curTag, bool curIsStyled, int32_t curFormat, + bool isFormatted, bool pseudolocalize, const bool overwrite, ResourceTable* outTable) @@ -627,7 +628,7 @@ status_t parseAndAddEntry(Bundle* bundle, Vector spans; err = parseStyledString(bundle, in->getPrintableSource().string(), block, curTag, &str, curIsStyled ? &spans : NULL, - pseudolocalize); + isFormatted, pseudolocalize); if (err < NO_ERROR) { return err; @@ -710,12 +711,18 @@ status_t compileResourceFile(Bundle* bundle, // useful attribute names and special values const String16 name16("name"); const String16 translatable16("translatable"); + const String16 formatted16("formatted"); const String16 false16("false"); const String16 myPackage(assets->getPackage()); bool hasErrors = false; - + + bool fileIsTranslatable = true; + if (strstr(in->getPrintableSource().string(), "donottranslate") != NULL) { + fileIsTranslatable = false; + } + DefaultKeyedVector nextPublicId(0); ResXMLTree::event_code_t code; @@ -752,6 +759,7 @@ status_t compileResourceFile(Bundle* bundle, bool curIsBagReplaceOnOverwrite = false; bool curIsStyled = false; bool curIsPseudolocalizable = false; + bool curIsFormatted = fileIsTranslatable; bool localHasErrors = false; if (strcmp16(block.getElementName(&len), skip16.string()) == 0) { @@ -1137,6 +1145,7 @@ status_t compileResourceFile(Bundle* bundle, String8 locale(rawLocale); String16 name; String16 translatable; + String16 formatted; size_t n = block.getAttributeCount(); for (size_t i = 0; i < n; i++) { @@ -1146,11 +1155,14 @@ status_t compileResourceFile(Bundle* bundle, name.setTo(block.getAttributeStringValue(i, &length)); } else if (strcmp16(attr, translatable16.string()) == 0) { translatable.setTo(block.getAttributeStringValue(i, &length)); + } else if (strcmp16(attr, formatted16.string()) == 0) { + formatted.setTo(block.getAttributeStringValue(i, &length)); } } if (name.size() > 0) { if (translatable == false16) { + curIsFormatted = false; // Untranslatable strings must only exist in the default [empty] locale if (locale.size() > 0) { fprintf(stderr, "aapt: warning: string '%s' in %s marked untranslatable but exists" @@ -1168,6 +1180,10 @@ status_t compileResourceFile(Bundle* bundle, } else { outTable->addLocalization(name, locale); } + + if (formatted == false16) { + curIsFormatted = false; + } } curTag = &string16; @@ -1357,7 +1373,7 @@ status_t compileResourceFile(Bundle* bundle, block.getPosition(&parserPosition); err = parseAndAddBag(bundle, in, &block, curParams, myPackage, curType, - ident, parentIdent, itemIdent, curFormat, + ident, parentIdent, itemIdent, curFormat, curIsFormatted, false, overwrite, outTable); if (err == NO_ERROR) { if (curIsPseudolocalizable && localeIsDefined(curParams) @@ -1366,8 +1382,8 @@ status_t compileResourceFile(Bundle* bundle, #if 1 block.setPosition(parserPosition); err = parseAndAddBag(bundle, in, &block, pseudoParams, myPackage, - curType, ident, parentIdent, itemIdent, curFormat, true, - overwrite, outTable); + curType, ident, parentIdent, itemIdent, curFormat, + curIsFormatted, true, overwrite, outTable); #endif } } @@ -1390,7 +1406,8 @@ status_t compileResourceFile(Bundle* bundle, block.getPosition(&parserPosition); err = parseAndAddEntry(bundle, in, &block, curParams, myPackage, curType, ident, - *curTag, curIsStyled, curFormat, false, overwrite, outTable); + *curTag, curIsStyled, curFormat, curIsFormatted, + false, overwrite, outTable); if (err < NO_ERROR) { // Why err < NO_ERROR instead of err != NO_ERROR? hasErrors = localHasErrors = true; @@ -1401,7 +1418,8 @@ status_t compileResourceFile(Bundle* bundle, // pseudolocalize here block.setPosition(parserPosition); err = parseAndAddEntry(bundle, in, &block, pseudoParams, myPackage, curType, - ident, *curTag, curIsStyled, curFormat, true, overwrite, outTable); + ident, *curTag, curIsStyled, curFormat, + curIsFormatted, true, overwrite, outTable); if (err != NO_ERROR) { hasErrors = localHasErrors = true; } @@ -1934,7 +1952,7 @@ bool ResourceTable::stringToValue(Res_value* outValue, StringPool* pool, // information we have already processed that string! outValue->size = sizeof(Res_value); outValue->res0 = 0; - outValue->dataType = Res_value::TYPE_STRING; + outValue->dataType = outValue->TYPE_STRING; outValue->data = 0; finalStr = str; } @@ -1943,7 +1961,7 @@ bool ResourceTable::stringToValue(Res_value* outValue, StringPool* pool, return false; } - if (outValue->dataType == Res_value::TYPE_STRING) { + if (outValue->dataType == outValue->TYPE_STRING) { // Should do better merging styles. if (pool) { if (style != NULL && style->size() > 0) { @@ -2528,10 +2546,11 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& dest) const size_t N = mOrderedPackages.size(); size_t pi; + bool useUTF8 = !bundle->getWantUTF16() && bundle->isMinSdkAtLeast(SDK_FROYO); + // Iterate through all data, collecting all values (strings, // references, etc). - StringPool valueStrings = StringPool(false, bundle->getUTF8()); - ResourceConfigReferences configRefs; + StringPool valueStrings = StringPool(false, useUTF8); for (pi=0; pi p = mOrderedPackages.itemAt(pi); if (p->getTypes().size() == 0) { @@ -2539,8 +2558,8 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& dest) continue; } - StringPool typeStrings = StringPool(false, bundle->getUTF8()); - StringPool keyStrings = StringPool(false, bundle->getUTF8()); + StringPool typeStrings = StringPool(false, useUTF8); + StringPool keyStrings = StringPool(false, useUTF8); const size_t N = p->getOrderedTypes().size(); for (size_t ti=0; ti& dest) if (err != NO_ERROR) { return err; } - if (e->getType() == Entry::TYPE_ITEM) { - const Item* item = e->getItem(); - if (item != NULL) { - uint32_t poolIndex = item->parsedValue.data; - configRefs.add(poolIndex, config); - } - } } } } @@ -2587,70 +2599,6 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp& dest) p->setKeyStrings(keyStrings.createStringBlock()); } - NOISY_REF(configRefs.dump();) - - // Trim all entries in config tables that are not roots for that string. - // i.e., rely on the resource system to grab the string from the more - // generic pool during runtime to save space. - for (pi=0; pi p = mOrderedPackages.itemAt(pi); - if (p->getTypes().size() == 0) { - // Empty, skip! - continue; - } - const size_t TN = p->getOrderedTypes().size(); - for (size_t ti=0; ti t = p->getOrderedTypes().itemAt(ti); - if (t == NULL) { - continue; - } - size_t CN = t->getOrderedConfigs().size(); - for (size_t ci=0; ci c = t->getOrderedConfigs().itemAt(ci); - if (c == NULL) { - continue; - } - DefaultKeyedVector > newEntries; - size_t EN = c->getEntries().size(); - for (size_t ei=0; eigetEntries().keyAt(ei); - if (!filter.match(config)) { - continue; - } - sp e = c->getEntries().valueAt(ei); - if (e == NULL) { - continue; - } - if (e->getType() == Entry::TYPE_ITEM) { - const Item* item = e->getItem(); - if (item != NULL) { - uint32_t poolIndex = item->parsedValue.data; - if (!configRefs.isRoot(poolIndex, config)) { - NOISY_REF( - printf(" ConfigRef %d: removing ", poolIndex); - DEBUG_LANG(config) - printf("\n"); - ) - c->removeEntryAt(ei); - t->removeUniqueConfig(config); - --ei; --EN; - } - } - } - } - if (EN == 0) { - // We removed all the entries from a config, so remove the - // config itself. - NOISY_REF( - printf(" ConfigRef REMOVED ENTIRE CONFIG\n"); - ) - t->removeOrderedConfigAt(ci); - --ci; --CN; - } - } - } - } - ssize_t strAmt = 0; // Now build the array of package chunks. @@ -3805,95 +3753,3 @@ bool ResourceTable::getItemValue( } return res; } - -#define DEBUG_LANG(x) printf("lang=%c%c cnt=%c%c ", \ - (x).language[0] ? (x).language[0] : '-', \ - (x).language[1] ? (x).language[1] : '-', \ - (x).country[0] ? (x).country[0] : '-', \ - (x).country[1] ? (x).country[1] : '-'); - -status_t ResourceConfigReferences::add(uint32_t id, const ResTable_config& config) -{ - ssize_t index = mRoots.indexOfKey(id); - if (index < 0) { - index = mRoots.add(id, Vector()); - } - Vector& configRoots = mRoots.editValueFor(id); - - if (!configRoots.isEmpty()) { - ssize_t NR = configRoots.size(); - for (int ri=0; rimatch(config)) { - // more generic - NOISY_REF( - printf(" ConfigRef %d: remove ", id); - DEBUG_LANG(current) - printf("\n"); - ) - configRoots.removeItemsAt(ri); - --ri; --NR; - } - } - } - NOISY_REF( - printf(" ConfigRef %d: add ", id); - DEBUG_LANG(config) - printf("\n"); - ) - ResTable_config *configCopy = (ResTable_config*)malloc(sizeof(ResTable_config)); - memcpy(configCopy, &config, sizeof(ResTable_config)); - configRoots.add(configCopy); - - return NO_ERROR; -} - -void ResourceConfigReferences::dump() -{ - printf("ResourceConfigReferences\n"); - const ssize_t NR = mRoots.size(); - for (int ri=0; ri& configRoots = mRoots.valueAt(ri); - printf(" String %d\n", mRoots.keyAt(ri)); - const ssize_t NC = configRoots.size(); - for (int ci=0; ci& configRoots = mRoots.editValueFor(id); - const ssize_t NR = configRoots.size(); - for (int ri = 0; rimatch(config)) { - return true; - } - } - return false; -} - -ResourceConfigReferences::~ResourceConfigReferences() -{ - const ssize_t NR = mRoots.size(); - for (int ri=0; ri configRoots = mRoots.editValueAt(ri); - const ssize_t NC = configRoots.size(); - for (int ci=0; ci(configRoots[ci]); - free(config); - } - } -}