commit e0af925c8f211ae7567f6f0d2f36c16d721b937c
author Alexandria Cornwall <acornwall@google.com> Fri Jul 22 16:25:02 2016 -0700
committer Alexandria Cornwall <acornwall@google.com> Mon Jul 25 09:46:38 2016 -0700
tree 545fd8f1af8d07cd01d75a68e8e1bf4371637244
parent fd1ba564587623ddcbe1800777a3acee23b598fa

AAPT2: Convert StringPool flattening to UTF-8

Convert StringPools in resources.arsc and binary XML files to use UTF-8
instead of UTF-16 to save lots of bytes.

Bug: 30053277
Change-Id: I8eb6c78644e51b15f89edadab71cc86f5a851a45

tools/aapt2/flatten/TableFlattener.cpp

diff --git a/tools/aapt2/flatten/TableFlattener.cpp b/tools/aapt2/flatten/TableFlattener.cpp
index 5fbb0fe..6a35e8c 100644
--- a/tools/aapt2/flatten/TableFlattener.cpp
+++ b/tools/aapt2/flatten/TableFlattener.cpp
@@ -244,7 +244,7 @@
         StringPool::flattenUtf16(pkgWriter.getBuffer(), mTypePool);
 
         pkgHeader->keyStrings = util::hostToDevice32(pkgWriter.size());
-        StringPool::flattenUtf16(pkgWriter.getBuffer(), mKeyPool);
+        StringPool::flattenUtf8(pkgWriter.getBuffer(), mKeyPool);
 
         // Append the types.
         buffer->appendBuffer(std::move(typeBuffer));