StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e77dbd2a62

Change-Id: Ibd6965c0b9517fe24e6f3267dc55700f3f320d18
This commit is contained in:
Tao Bao
2019-05-10 21:10:47 -07:00
committed by android-build-merger
parent 8acb88b50c e77dbd2a62
commit 189a8dff61
1 changed files with 4 additions and 2 deletions
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 OPTIONS.input_tmp = target_files
elif zipfile.is_zipfile(target_files): elif zipfile.is_zipfile(target_files):
logger.info("Building image zip from target files zip.") logger.info("Building image zip from target files zip.")
OPTIONS.input_tmp = common.UnzipTemp(target_files, # We need files under IMAGES/, OTA/, META/ for img_from_target_files.py.
["IMAGES/*", "OTA/*", "META/*"]) # 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: else:
raise ValueError("%s is not a valid path." % target_files) raise ValueError("%s is not a valid path." % target_files)