summaryrefslogtreecommitdiffstats
path: root/install/install.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-09-17 02:19:41 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-17 02:19:41 +0200
commita35202befd6460a30330d57e7e69564bc6fb29f9 (patch)
tree8a910b26d07884180bcef5f5f48781ae642cf99e /install/install.cpp
parentMerge "Merge Android R" (diff)
parentSwitch to zip64 in recovery (diff)
downloadandroid_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar.gz
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar.bz2
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar.lz
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar.xz
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.tar.zst
android_bootable_recovery-a35202befd6460a30330d57e7e69564bc6fb29f9.zip
Diffstat (limited to 'install/install.cpp')
-rw-r--r--install/install.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/install.cpp b/install/install.cpp
index 1c711f6b3..753373206 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -77,7 +77,7 @@ bool ReadMetadataFromPackage(ZipArchiveHandle zip, std::map<std::string, std::st
CHECK(metadata != nullptr);
static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata";
- ZipEntry entry;
+ ZipEntry64 entry;
if (FindEntry(zip, METADATA_PATH, &entry) != 0) {
LOG(ERROR) << "Failed to find " << METADATA_PATH;
return false;
@@ -241,7 +241,7 @@ bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
// For A/B updates we extract the payload properties to a buffer and obtain the RAW payload offset
// in the zip file.
static constexpr const char* AB_OTA_PAYLOAD_PROPERTIES = "payload_properties.txt";
- ZipEntry properties_entry;
+ ZipEntry64 properties_entry;
if (FindEntry(zip, AB_OTA_PAYLOAD_PROPERTIES, &properties_entry) != 0) {
LOG(ERROR) << "Failed to find " << AB_OTA_PAYLOAD_PROPERTIES;
return false;
@@ -256,7 +256,7 @@ bool SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
}
static constexpr const char* AB_OTA_PAYLOAD = "payload.bin";
- ZipEntry payload_entry;
+ ZipEntry64 payload_entry;
if (FindEntry(zip, AB_OTA_PAYLOAD, &payload_entry) != 0) {
LOG(ERROR) << "Failed to find " << AB_OTA_PAYLOAD;
return false;
@@ -278,7 +278,7 @@ bool SetUpNonAbUpdateCommands(const std::string& package, ZipArchiveHandle zip,
// In non-A/B updates we extract the update binary from the package.
static constexpr const char* UPDATE_BINARY_NAME = "META-INF/com/google/android/update-binary";
- ZipEntry binary_entry;
+ ZipEntry64 binary_entry;
if (FindEntry(zip, UPDATE_BINARY_NAME, &binary_entry) != 0) {
LOG(ERROR) << "Failed to find update binary " << UPDATE_BINARY_NAME;
return false;