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

install.h

diff --git a/install.h b/install.h
index 14de225..7f66a51 100644
--- a/install.h
+++ b/install.h
@@ -18,9 +18,9 @@
 #define RECOVERY_INSTALL_H_
 
 #include <string>
+#include <ziparchive/zip_archive.h>
 
 #include "common.h"
-#include "minzip/Zip.h"
 
 enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE, INSTALL_SKIPPED,
         INSTALL_RETRY };
@@ -36,6 +36,6 @@
 
 // Read meta data file of the package, write its content in the string pointed by meta_data.
 // Return true if succeed, otherwise return false.
-bool read_metadata_from_package(ZipArchive* zip, std::string* meta_data);
+bool read_metadata_from_package(ZipArchiveHandle zip, std::string* meta_data);
 
 #endif  // RECOVERY_INSTALL_H_