commit 8176cf232e9f613a2e500f09461fc3f448267d07
author Tianjie Xu <xunchang@google.com> Tue Oct 18 14:13:07 2016 -0700
committer Tianjie Xu <xunchang@google.com> Tue Oct 18 21:31:04 2016 +0000
tree 7bef9898660d13fc74dbe528bc0331950fe19604
parent 430b7ae4699eb3685dcc0f7c736a9aebd76829a8
parent 6fba98ce645bb00b4fa7f03dd1786566af919d78

resolve merge conflicts of 6fba98c to stage-aosp-master

Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 3b1305e..88c77d2 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -53,6 +53,7 @@
 #include <private/android_logger.h> /* private pmsg functions */
 #include <selinux/label.h>
 #include <selinux/selinux.h>
+#include <ziparchive/zip_archive.h>
 
 #include "adb_install.h"
 #include "common.h"
@@ -63,8 +64,7 @@
 #include "install.h"
 #include "minadbd/minadbd.h"
 #include "minui/minui.h"
-#include "minzip/DirUtil.h"
-#include "minzip/Zip.h"
+#include "otautil/DirUtil.h"
 #include "roots.h"
 #include "ui.h"
 #include "screen_ui.h"
@@ -936,19 +936,19 @@
     }
 
     // Extract metadata
-    ZipArchive zip;
-    int err = mzOpenZipArchive(reinterpret_cast<unsigned char*>(&wipe_package[0]),
-                               wipe_package.size(), &zip);
+    ZipArchiveHandle zip;
+    int err = OpenArchiveFromMemory(reinterpret_cast<void*>(&wipe_package[0]),
+                                    wipe_package.size(), "wipe_package", &zip);
     if (err != 0) {
-        LOG(ERROR) << "Can't open wipe package";
+        LOG(ERROR) << "Can't open wipe package : " << ErrorCodeString(err);
         return false;
     }
     std::string metadata;
     if (!read_metadata_from_package(&zip, &metadata)) {
-        mzCloseZipArchive(&zip);
+        CloseArchive(zip);
         return false;
     }
-    mzCloseZipArchive(&zip);
+    CloseArchive(zip);
 
     // Check metadata
     std::vector<std::string> lines = android::base::Split(metadata, "\n");