commit 6701db814585431ee032a5dab26a9c9af2323c7e
author Greg Hackmann <ghackmann@google.com> Mon Mar 23 14:05:50 2015 -0700
committer Greg Hackmann <ghackmann@google.com> Mon Mar 23 14:35:50 2015 -0700
tree 93fc31ff362a35a1664f87af26da7addb4a1401f
parent b59016703a540a541a94e352c1ef54442a0e95dd

Allow system images larger than 2GiB, pt. 2

We need to patch zipfile during close() too, because it refers to the
ZIP64 file size threshold when writing out the central directory

Bug: 18015246
Bug: 19888174

Change-Id: I1b49d653d0831fcc2106808f86c929d7a2b22ff3
Signed-off-by: Greg Hackmann <ghackmann@google.com>

tools/releasetools/img_from_target_files.py

diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py
index a9d4cbe..4dda0b7 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -141,7 +141,13 @@
 
   finally:
     print "cleaning up..."
+    # http://b/18015246
+    # See common.py for context.  zipfile also refers to ZIP64_LIMIT during
+    # close() when it writes out the central directory.
+    saved_zip64_limit = zipfile.ZIP64_LIMIT
+    zipfile.ZIP64_LIMIT = (1 << 32) - 1
     output_zip.close()
+    zipfile.ZIP64_LIMIT = saved_zip64_limit
     shutil.rmtree(OPTIONS.input_tmp)
 
   print "done."