tools/aapt/Main.cpp | 3 1 + 2 - 0 !
tools/aapt2/util/Util.cpp | 6 1 + 5 - 0 !
2 files changed, 2 insertions(+), 7 deletions(-)

---

tools/aapt/StringPool.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix a typo

libs/androidfw/Util.cpp | 1 1 + 0 - 0 !
libs/androidfw/include/androidfw/LoadedArsc.h | 2 1 + 1 - 0 !
tools/aapt2/util/Files.cpp | 2 1 + 1 - 0 !
tools/aapt2/util/Files.h | 2 1 + 1 - 0 !
4 files changed, 4 insertions(+), 3 deletions(-)

 fix std::vector must have a non-const, non-volatile value_type

tools/aapt2/Resources.proto | 2 1 + 1 - 0 !
tools/aapt2/ResourcesInternal.proto | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 fix proto import paths, this dir layout is different

core/jni/android_util_jar_StrictJarFile.cpp | 2 1 + 1 - 0 !
libs/androidfw/ApkAssets.cpp | 6 2 + 4 - 0 !
libs/androidfw/ZipFileRO.cpp | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 6 deletions(-)

 track libziparchive api change.

Bug: http://b/129068177
Test: treehugger

core/jni/android_util_jar_StrictJarFile.cpp | 12 2 + 10 - 0 !
libs/androidfw/ApkAssets.cpp | 3 1 + 2 - 0 !
libs/androidfw/ZipFileRO.cpp | 5 1 + 4 - 0 !
3 files changed, 4 insertions(+), 16 deletions(-)

 track libziparchive api change - 2nd.

Bug: http://b/129068177
Test: treehugger

tools/aapt2/io/ZipArchive.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't explicitly specify no prefix/suffix.

Bug: http://b/129068177
Test: treehugger

libs/androidfw/ApkAssets.cpp | 4 2 + 2 - 0 !
libs/androidfw/ZipFileRO.cpp | 8 4 + 4 - 0 !
tools/aapt2/cmd/Convert_test.cpp | 2 1 + 1 - 0 !
tools/aapt2/io/ZipArchive.cpp | 8 2 + 6 - 0 !
4 files changed, 9 insertions(+), 13 deletions(-)

 move off zipstring and over to std::string/std::string_view as
 appropriate.

Bug: http://b/129068177
Test: treehugger

tools/aapt2/io/Util.h | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 fix protobuf ftbfs
 SetTotalBytesLimit no longer has second argument.