Merge "[Bugfix] Check for presence before ZipWrite" am: bb8d9ed70f
am: c3a915294b
Original change: https://android-review.googlesource.com/c/platform/build/+/2115654 Change-Id: Ifb49b4e8f30ea1da194e914c68cd01f63d8ccd4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
71880d9de6
1 changed files with 2 additions and 1 deletions
|
@ -1355,7 +1355,8 @@ def BuildVendorPartitions(output_zip_path):
|
|||
img_file_path = "IMAGES/{}.img".format(p)
|
||||
map_file_path = "IMAGES/{}.map".format(p)
|
||||
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, img_file_path), img_file_path)
|
||||
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, map_file_path), map_file_path)
|
||||
if os.path.exists(os.path.join(vendor_tempdir, map_file_path)):
|
||||
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, map_file_path), map_file_path)
|
||||
# copy recovery.img, boot.img, recovery patch & install.sh
|
||||
if OPTIONS.rebuild_recovery:
|
||||
recovery_img = "IMAGES/recovery.img"
|
||||
|
|
Loading…
Reference in a new issue