commit f8053c58571543104250198a26574c3b1e338d5b
author Elliott Hughes <enh@google.com> Thu May 09 19:22:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 09 19:22:14 2019 -0700
tree 7d8b66ab9a0f452e9a4f8f8ce7d2acc8ccd0735e
parent 4161a635ce59ca3d9cae656465466689cdfe800e
parent 774a79492a25767660494856500f90789fa3494e

Merge "Track libziparchive API change." am: 6da27adb0b am: 46fa74623a
am: 774a79492a

Change-Id: I8c678857bd4fa6d9a5b227a3931bf919f1896172

applypatch/imgdiff.cpp

diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index 415d95f..cb34d46 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -675,7 +675,7 @@
 // Iterate the zip entries and compose the image chunks accordingly.
 bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandle handle) {
   void* cookie;
-  int ret = StartIteration(handle, &cookie, nullptr, nullptr);
+  int ret = StartIteration(handle, &cookie);
   if (ret != 0) {
     LOG(ERROR) << "Failed to iterate over entries in " << filename << ": " << ErrorCodeString(ret);
     return false;

install/install.cpp

diff --git a/install/install.cpp b/install/install.cpp
index d62bffc..1b51b42 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -529,7 +529,7 @@
 
   // Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents.
   void* cookie;
-  ret = StartIteration(zip_handle, &cookie, nullptr, nullptr);
+  ret = StartIteration(zip_handle, &cookie);
   if (ret != 0) {
     LOG(ERROR) << "Failed to start iterating zip entries: " << ErrorCodeString(ret);
     CloseArchive(zip_handle);

install/verifier.cpp

diff --git a/install/verifier.cpp b/install/verifier.cpp
index 6ba1d77..3de58e4 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -311,8 +311,7 @@
 
 static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) {
   void* cookie;
-  ZipString suffix("x509.pem");
-  int32_t iter_status = StartIteration(handle, &cookie, nullptr, &suffix);
+  int32_t iter_status = StartIteration(handle, &cookie, "", "x509.pem");
   if (iter_status != 0) {
     LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: "
                << ErrorCodeString(iter_status);