diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:24 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:24 -0700 |
| commit | e0f87f165ecf0f44be98c5101ade78d746f3322c (patch) | |
| tree | dcda27d29a15412997d7d588c8e211457439231b /tools | |
| parent | caf9123b78d25476e057701c2a3fb64d2ce09d53 (diff) | |
| parent | 90ea10c4d3e4aceba98276f5f16389aa6f99584a (diff) | |
| download | frameworks_base-e0f87f165ecf0f44be98c5101ade78d746f3322c.zip frameworks_base-e0f87f165ecf0f44be98c5101ade78d746f3322c.tar.gz frameworks_base-e0f87f165ecf0f44be98c5101ade78d746f3322c.tar.bz2 | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt2/Util.cpp | 4 | ||||
| -rw-r--r-- | tools/split-select/Android.mk | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 68c2fe8f..ee26729 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -63,8 +63,8 @@ aaptHostLdLibs := aaptHostStaticLibs := \ libandroidfw \ libpng \ - liblog \ libutils \ + liblog \ libcutils \ libexpat \ libziparchive-host \ diff --git a/tools/aapt2/Util.cpp b/tools/aapt2/Util.cpp index 03ecd1a..5b064e3 100644 --- a/tools/aapt2/Util.cpp +++ b/tools/aapt2/Util.cpp @@ -303,8 +303,10 @@ std::string utf16ToUtf8(const StringPiece16& utf16) { } std::string utf8; + // Make room for '\0' explicitly. + utf8.resize(utf8Length + 1); + utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1); utf8.resize(utf8Length); - utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin()); return utf8; } diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk index d9ddf08..54f0a1f 100644 --- a/tools/split-select/Android.mk +++ b/tools/split-select/Android.mk @@ -48,8 +48,8 @@ hostStaticLibs := \ libaapt \ libandroidfw \ libpng \ - liblog \ libutils \ + liblog \ libcutils \ libexpat \ libziparchive-host \ |