p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tao Bao 2019-05-10 15:47:37 -07:00
parent aa448d138b
commit 1dac1d4164
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/img_from_target_files.py
View File

@ -180,8 +180,10 @@ def main(argv):
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)