commit 2de68bbbf49473c09d434a75e669345392e03240
author Justin Harrison <astyrrian@google.com> Fri Feb 13 18:47:51 2015 +0000
committer Justin Harrison <astyrrian@google.com> Fri Feb 13 18:47:51 2015 +0000
tree 9af5d8cc6c2c64193cf650e755d95f3fdf381e3e
parent cd082d4bfe917b2e6b97436839cbbbc67c733c83

Revert "Allow system images larger than 2GiB."

This reverts commit cd082d4bfe917b2e6b97436839cbbbc67c733c83.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 8bbe452..e98e4b6 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -30,6 +30,9 @@
 
 import errno
 import os
+import re
+import shutil
+import subprocess
 import tempfile
 import zipfile
 
@@ -67,8 +70,10 @@
   block_list = common.MakeTempFile(prefix="system-blocklist-", suffix=".map")
   imgname = BuildSystem(OPTIONS.input_tmp, OPTIONS.info_dict,
                         block_list=block_list)
-  common.ZipWrite(output_zip, imgname, prefix + "system.img")
-  common.ZipWrite(output_zip, block_list, prefix + "system.map")
+  with open(imgname, "rb") as f:
+    common.ZipWriteStr(output_zip, prefix + "system.img", f.read())
+  with open(block_list, "rb") as f:
+    common.ZipWriteStr(output_zip, prefix + "system.map", f.read())
 
 
 def BuildSystem(input_dir, info_dict, block_list=None):
@@ -89,8 +94,10 @@
   block_list = common.MakeTempFile(prefix="vendor-blocklist-", suffix=".map")
   imgname = BuildVendor(OPTIONS.input_tmp, OPTIONS.info_dict,
                      block_list=block_list)
-  common.ZipWrite(output_zip, imgname, prefix + "vendor.img")
-  common.ZipWrite(output_zip, block_list, prefix + "vendor.map")
+  with open(imgname, "rb") as f:
+    common.ZipWriteStr(output_zip, prefix + "vendor.img", f.read())
+  with open(block_list, "rb") as f:
+    common.ZipWriteStr(output_zip, prefix + "vendor.map", f.read())
 
 
 def BuildVendor(input_dir, info_dict, block_list=None):
@@ -289,6 +296,7 @@
   output_zip.close()
 
 def main(argv):
+
   def option_handler(o, a):
     if o in ("-a", "--add_missing"):
       OPTIONS.add_missing = True