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

am: 189a8dff61

Change-Id: Idd065bff59364883e9f37487b904b3d277deb8f9
This commit is contained in:
Tao Bao 2019-05-10 21:15:59 -07:00 committed by android-build-merger
commit 5ed6499abf
1 changed files with 4 additions and 2 deletions

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)