commit 549e437e14f3b92f02bd3abc7d1cd68387132ce1
author Adam Lesinski <adamlesinski@google.com> Tue Jun 27 18:39:07 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Jun 29 18:17:35 2017 -0700
tree b7f1e2089d81ad530b1e78914ad97bdedfeaa9c7
parent 2fa4a346ecea162d3e694c2c53582f3cc31bcc68

AAPT2: Iterate over UTF-8 string by codepoints

Iterating over a UTF-8 string by codepoints ensures that
unicode characters do not get sliced. Otherwise the resulting
string could contain malformed characters.

Bug: 62839202
Test: make aapt2_tests
Change-Id: Ia0c44fbceb7dcfa11e77a1a77011da0f5466e342

tools/aapt2/Android.bp

diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index d39a8a8..46c0ff0 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -115,6 +115,7 @@
         "unflatten/ResChunkPullParser.cpp",
         "util/BigBuffer.cpp",
         "util/Files.cpp",
+        "util/Utf8Iterator.cpp",
         "util/Util.cpp",
         "ConfigDescription.cpp",
         "Debug.cpp",