Revert "Remove all ZIP64LIMIT hack"
This reverts commit 37a4290909717577731bc53c8f4ccd72c4d4d5d5.
Reason for revert: b/278156419
Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 60e95ad..9d5c67d 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -487,7 +487,7 @@
else:
common.ZipWrite(target_zip, unzipped_file, arcname=info.filename)
- target_zip.close()
+ common.ZipClose(target_zip)
return target_file
@@ -624,7 +624,7 @@
# TODO(xunchang) handle META/postinstall_config.txt'
- partial_target_zip.close()
+ common.ZipClose(partial_target_zip)
return partial_target_file
@@ -709,7 +709,7 @@
# 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 @@
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)