Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4fcf4c05 authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

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

Change-Id: Ib5c9f2f0fa90fd921d8f61b74364a20aaecb842e
parent e2ba83e0

tools/releasetools/non_ab_ota.py

+2 −1
Original line number Original line Diff line number Diff line
@@ -176,6 +176,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"
@@ -183,7 +185,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)