releasetools: Unconditionally store recovery.img in non-A/B OTA

Change-Id: Ib5c9f2f0fa90fd921d8f61b74364a20aaecb842e
This commit is contained in:
LuK1337 2022-02-11 17:54:04 +01:00 committed by Bartłomiej Rudecki
parent 6ee8d10147
commit 82d9f1507a
Signed by: przekichane
GPG key ID: 751F23C6F014EF76

View file

@ -177,6 +177,8 @@ def WriteFullOTAPackage(input_zip, output_file):
recovery_img = common.GetBootableImage("recovery.img", "recovery.img", recovery_img = common.GetBootableImage("recovery.img", "recovery.img",
OPTIONS.input_tmp, "RECOVERY") OPTIONS.input_tmp, "RECOVERY")
common.CheckSize(recovery_img.data, "recovery.img", target_info)
common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data)
if OPTIONS.two_step: if OPTIONS.two_step:
if not target_info.get("multistage_support"): if not target_info.get("multistage_support"):
assert False, "two-step packages not supported by this build" assert False, "two-step packages not supported by this build"
@ -184,7 +186,6 @@ def WriteFullOTAPackage(input_zip, output_file):
assert fs.fs_type.upper() == "EMMC", \ assert fs.fs_type.upper() == "EMMC", \
"two-step packages only supported on devices with EMMC /misc partitions" "two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data)
script.AppendExtra(""" script.AppendExtra("""
if get_stage("%(bcb_dev)s") == "2/3" then if get_stage("%(bcb_dev)s") == "2/3" then
""" % bcb_dev) """ % bcb_dev)