Merge "Revert "Remove all ZIP64LIMIT hack""

2023-04-15 01:48:58 +00:00
parent 5da012adb0 f92f7f046a
commit 7b640806da
9 changed files with 101 additions and 67 deletions
--- a/tools/releasetools/non_ab_ota.py
+++ b/tools/releasetools/non_ab_ota.py
@@ -272,7 +272,7 @@ endif;

  # We haven't written the metadata entry, which will be done in
  # FinalizeMetadata.
-  output_zip.close()
+  common.ZipClose(output_zip)

  needed_property_files = (
      NonAbOtaPropertyFiles(),
@@ -526,7 +526,7 @@ endif;

  # We haven't written the metadata entry yet, which will be handled in
  # FinalizeMetadata().
-  output_zip.close()
+  common.ZipClose(output_zip)

  # Sign the generated zip package unless no_signing is specified.
  needed_property_files = (