diff options
author | Kenny Root <kroot@google.com> | 2009-12-04 09:38:48 -0800 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2009-12-07 15:14:15 -0800 |
commit | 19138468caf7050d482dc15f35a344eab11bb756 (patch) | |
tree | ea1f96c5bcab356355ab05d315abfa66a7f888c4 /tools/aapt/ResourceTable.cpp | |
parent | 6be01bf207077ffbdcd3879250171a26ec805835 (diff) | |
download | frameworks_base-19138468caf7050d482dc15f35a344eab11bb756.zip frameworks_base-19138468caf7050d482dc15f35a344eab11bb756.tar.gz frameworks_base-19138468caf7050d482dc15f35a344eab11bb756.tar.bz2 |
Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.
When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.
Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
-rw-r--r-- | tools/aapt/ResourceTable.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 19b9b01..a9cbd11 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -39,6 +39,10 @@ status_t compileXmlFile(const sp<AaptAssets>& assets, root->removeWhitespace(false, NULL); } + if ((options&XML_COMPILE_UTF8) != 0) { + root->setUTF8(true); + } + bool hasErrors = false; if ((options&XML_COMPILE_ASSIGN_ATTRIBUTE_IDS) != 0) { @@ -2505,7 +2509,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<AaptFile>& dest) // Iterate through all data, collecting all values (strings, // references, etc). - StringPool valueStrings; + StringPool valueStrings = StringPool(false, bundle->getUTF8()); for (pi=0; pi<N; pi++) { sp<Package> p = mOrderedPackages.itemAt(pi); if (p->getTypes().size() == 0) { @@ -2513,8 +2517,8 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<AaptFile>& dest) continue; } - StringPool typeStrings; - StringPool keyStrings; + StringPool typeStrings = StringPool(false, bundle->getUTF8()); + StringPool keyStrings = StringPool(false, bundle->getUTF8()); const size_t N = p->getOrderedTypes().size(); for (size_t ti=0; ti<N; ti++) { |