commit a3c3b9bc64e45b51c210e062b6a61a04333be36c
author Tao Bao <tbao@google.com> Fri May 10 15:47:37 2019 -0700
committer Tao Bao <tbao@google.com> Fri May 10 15:52:01 2019 -0700
tree 03d773a2d511a9daeb9a78234a24b4ee25f81456
parent 6311b83cc26657400ca8284a89eda033c996d68b

releasetools: Unzip all files when generating image archive.

Commit 7df64c3e starts to call common.LoadInfoDict() when generating
image archive, which reads additional files under BOOT/, RECOVERY/ and
ROOT/. Unzip everything from the target_files.zip.

Bug: 132456827
Test: Run img_from_target_files.py on previously failing
      target_files.zip.
Change-Id: I22ee57c4f765bee9494478bf115b1581877401f4

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 d44931a..e01b5e8 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -166,8 +166,10 @@
 
   common.InitLogging()
 
-  OPTIONS.input_tmp = common.UnzipTemp(args[0],
-                                       ["IMAGES/*", "OTA/*", "META/*"])
+  # We need files under IMAGES/, OTA/, META/ for img_from_target_files.py.
+  # However, common.LoadInfoDict() may read additional files under BOOT/,
+  # RECOVERY/ and ROOT/. So unzip everything from the target_files.zip.
+  OPTIONS.input_tmp = common.UnzipTemp(args[0])
   LoadOptions(OPTIONS.input_tmp)
   output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED,
                                allowZip64=not OPTIONS.sparse_userimages)