commit e77dbd2a620c6df543e329ba55a91fbd1262600c
author Tao Bao <tbao@google.com> Sat May 11 03:48:02 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 11 03:48:02 2019 +0000
tree ffb4332495573ca767f2b32347d6a8f764425b82
parent aa448d138ba92790f8283fda9e525bb736b38916
parent 1dac1d4164bbdd80c22b42220b1335d5bab264df

Merge "releasetools: Unzip all files when generating image archive."

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 6165d96..8fb9871 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -180,8 +180,10 @@
     OPTIONS.input_tmp = target_files
   elif zipfile.is_zipfile(target_files):
     logger.info("Building image zip from target files zip.")
-    OPTIONS.input_tmp = common.UnzipTemp(target_files,
-                                         ["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(target_files)
   else:
     raise ValueError("%s is not a valid path." % target_files)