| commit | d90d8d615a99ad9f75e2911e98a166b396a89053 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Tue Jun 28 18:26:10 2016 +0100 |
| committer | Martijn Coenen <maco@google.com> | Thu Aug 25 12:19:12 2016 +0200 |
| tree | a36708554d2e9010da4601b1930510926bcc2d42 | |
| parent | 8f7b8a1f6c5808ea205bfb3294a313e2bcaedf7f [diff] [blame] |
Add bound checks to utf16_to_utf8 Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index b701445..2a490d1 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk
@@ -57,8 +57,8 @@ aaptHostStaticLibs := \ libandroidfw \ libpng \ - liblog \ libutils \ + liblog \ libcutils \ libexpat \ libziparchive-host \