commit 78e68ceb2b7483afb5eb4b3ccec522705129160a
author Elliott Hughes <enh@google.com> Mon May 13 11:22:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 13 11:22:04 2019 -0700
tree 5a8fa1d54804dd476cc80648d66e7557ffdfeb1a
parent 10f05c0f1e12aa6729d9917c009882c5606c10d5
parent d47c87a2e674a804041fea4445d77a88af62ee2b

Merge "Don't explicitly specify no prefix/suffix." am: 480d18c472
am: d47c87a2e6

Change-Id: I7cc6d962ec602c844ad9e7f6179260e247b04dc8

tools/aapt2/io/ZipArchive.cpp

diff --git a/tools/aapt2/io/ZipArchive.cpp b/tools/aapt2/io/ZipArchive.cpp
index f6aaa12..a692ba5 100644
--- a/tools/aapt2/io/ZipArchive.cpp
+++ b/tools/aapt2/io/ZipArchive.cpp
@@ -114,7 +114,7 @@
   }
 
   void* cookie = nullptr;
-  result = StartIteration(collection->handle_, &cookie, nullptr, nullptr);
+  result = StartIteration(collection->handle_, &cookie);
   if (result != 0) {
     if (out_error) *out_error = ErrorCodeString(result);
     return {};