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

Commit 21dcd3d4 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Allow OEMs to bypass the on device SPL downgrade check" into main am:... 

Merge "Allow OEMs to bypass the on device SPL downgrade check" into main am: 9e348cfc am: 70ba39f2

Original change: https://android-review.googlesource.com/c/platform/build/+/2799481



Change-Id: I5404a656d1bd05484edf675b534f23266ca6c153
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a18724f 70ba39f2

tools/releasetools/ota_from_target_files.py

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  metadata = GetPackageMetadata(target_info, source_info)

  # Generate payload.

  payload = PayloadGenerator(

      wipe_user_data=OPTIONS.wipe_user_data, minor_version=OPTIONS.force_minor_version, is_partial_update=OPTIONS.partial)

      wipe_user_data=OPTIONS.wipe_user_data, minor_version=OPTIONS.force_minor_version, is_partial_update=OPTIONS.partial, spl_downgrade=OPTIONS.spl_downgrade)



  partition_timestamps_flags = []

  # Enforce a max timestamp this payload can be applied on top of.

tools/releasetools/ota_utils.py

+9 −6
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ class PayloadGenerator(object): 
  SECONDARY_PAYLOAD_BIN = 'secondary/payload.bin'

  SECONDARY_PAYLOAD_PROPERTIES_TXT = 'secondary/payload_properties.txt'



  def __init__(self, secondary=False, wipe_user_data=False, minor_version=None, is_partial_update=False):

  def __init__(self, secondary=False, wipe_user_data=False, minor_version=None, is_partial_update=False, spl_downgrade=False):

    """Initializes a Payload instance.



    Args:
@@ -803,6 +803,7 @@ class PayloadGenerator(object): 
    self.wipe_user_data = wipe_user_data

    self.minor_version = minor_version

    self.is_partial_update = is_partial_update

    self.spl_downgrade = spl_downgrade



  def _Run(self, cmd):  # pylint: disable=no-self-use

    # Don't pipe (buffer) the output if verbose is set. Let
@@ -912,13 +913,15 @@ class PayloadGenerator(object): 
           "--properties_file=" + properties_file]

    self._Run(cmd)



    if self.secondary:

      with open(properties_file, "a") as f:

        f.write("SWITCH_SLOT_ON_REBOOT=0\n")



    if self.wipe_user_data:

    with open(properties_file, "a") as f:

      if self.wipe_user_data:

        f.write("POWERWASH=1\n")

      if self.secondary:

        f.write("SWITCH_SLOT_ON_REBOOT=0\n")

      if self.spl_downgrade:

        f.write("SPL_DOWNGRADE=1\n")





    self.payload_properties = properties_file