am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"

* commit '088521ef906346e06ce39c877ff142c2467e3a79':
  Allow system images larger than 2GiB, pt. 2
This commit is contained in:
Greg Hackmann 2015-03-23 21:55:50 +00:00 committed by Android Git Automerger
commit 9f201b18be

View file

@ -141,7 +141,13 @@ def main(argv):
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."