Revert "Remove all ZIP64LIMIT hack"

This reverts commit 37a4290909.

Reason for revert: b/278156419

Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
This commit is contained in:
Kelvin Zhang
2023-04-14 21:32:54 +00:00
committed by Gerrit Code Review
parent 37a4290909
commit f92f7f046a
9 changed files with 101 additions and 67 deletions

View File

@@ -487,7 +487,7 @@ def GetTargetFilesZipForSecondaryImages(input_file, skip_postinstall=False):
else:
common.ZipWrite(target_zip, unzipped_file, arcname=info.filename)
target_zip.close()
common.ZipClose(target_zip)
return target_file
@@ -624,7 +624,7 @@ def GetTargetFilesZipForPartialUpdates(input_file, ab_partitions):
# TODO(xunchang) handle META/postinstall_config.txt'
partial_target_zip.close()
common.ZipClose(partial_target_zip)
return partial_target_file
@@ -709,7 +709,7 @@ def GetTargetFilesZipForRetrofitDynamicPartitions(input_file,
# Write new ab_partitions.txt file
common.ZipWrite(target_zip, new_ab_partitions, arcname=AB_PARTITIONS)
target_zip.close()
common.ZipClose(target_zip)
return target_file
@@ -1017,11 +1017,11 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
common.ZipWriteStr(output_zip, "apex_info.pb", ota_apex_info,
compress_type=zipfile.ZIP_STORED)
target_zip.close()
common.ZipClose(target_zip)
# We haven't written the metadata entry yet, which will be handled in
# FinalizeMetadata().
output_zip.close()
common.ZipClose(output_zip)
FinalizeMetadata(metadata, staging_file, output_file,
package_key=OPTIONS.package_key)