Remove all ZIP64LIMIT hack

In the old days, we hacked values of ZIP64LIMIT to get around size
limitations of non-zip64 supported zip files. Now that we switched to
python3 + zip64, there's no point in keeping those hacks.

Test: th
Bug: 255683436
Change-Id: I913db33dad5503736c68a7a1f1321aa952019f60
This commit is contained in:
Kelvin Zhang
2022-10-26 12:49:03 -07:00
parent 1de1788dda
commit 37a4290909
9 changed files with 67 additions and 101 deletions

View File

@@ -842,14 +842,13 @@ def ReplaceUpdatedFiles(zip_filename, files_list):
SYSTEM/ after rebuilding recovery.
"""
common.ZipDelete(zip_filename, files_list)
output_zip = zipfile.ZipFile(zip_filename, "a",
with zipfile.ZipFile(zip_filename, "a",
compression=zipfile.ZIP_DEFLATED,
allowZip64=True)
for item in files_list:
file_path = os.path.join(OPTIONS.input_tmp, item)
assert os.path.exists(file_path)
common.ZipWrite(output_zip, file_path, arcname=item)
common.ZipClose(output_zip)
allowZip64=True) as output_zip:
for item in files_list:
file_path = os.path.join(OPTIONS.input_tmp, item)
assert os.path.exists(file_path)
common.ZipWrite(output_zip, file_path, arcname=item)
def HasPartition(partition_name):
@@ -1176,7 +1175,7 @@ def AddImagesToTargetFiles(filename):
AddVbmetaDigest(output_zip)
if output_zip:
common.ZipClose(output_zip)
output_zip.close()
if OPTIONS.replace_updated_files_list:
ReplaceUpdatedFiles(output_zip.filename,
OPTIONS.replace_updated_files_list)