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

Commit e78f998e authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71 am:... 

Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71 am: 70e4fa03 am: 236b709d

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



Change-Id: I1aaa20e89e874992ba7525da3df7d7cc3175575b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98145fb7 236b709d

tools/releasetools/common.py

+19 −0
Original line number Original line Diff line number Diff line
@@ -460,6 +460,25 @@ class BuildInfo(object): 
    system_prop = self.info_dict.get("system.build.prop")

    system_prop = self.info_dict.get("system.build.prop")

    return system_prop and system_prop.GetProp("ro.build.version.release") == "11"

    return system_prop and system_prop.GetProp("ro.build.version.release") == "11"





  @property

  def vendor_api_level(self):

    vendor_prop = self.info_dict.get("vendor.build.prop")

    if not vendor_prop:

      return -1



    props = [

        "ro.board.api_level",

        "ro.board.first_api_level",

        "ro.product.first_api_level",

    ]

    for prop in props:

      value = vendor_prop.GetProp(prop)

      try:

          return int(value)

      except:

          pass

    return -1



  @property

  @property

  def is_vabc_xor(self):

  def is_vabc_xor(self):

    vendor_prop = self.info_dict.get("vendor.build.prop")

    vendor_prop = self.info_dict.get("vendor.build.prop")

tools/releasetools/ota_from_target_files.py

+13 −0
Original line number Original line Diff line number Diff line
@@ -909,6 +909,19 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    logger.info(

    logger.info(

        "VABC Compression algorithm is set to 'none', disabling VABC xor")

        "VABC Compression algorithm is set to 'none', disabling VABC xor")

    OPTIONS.enable_vabc_xor = False

    OPTIONS.enable_vabc_xor = False



  if OPTIONS.enable_vabc_xor:

    api_level = -1

    if source_info is not None:

      api_level = source_info.vendor_api_level

    if api_level == -1:

      api_level = target_info.vendor_api_level



    # XOR is only supported on T and higher.

    if api_level < 33:

      logger.error("VABC XOR not supported on this vendor, disabling")

      OPTIONS.enable_vabc_xor = False



  additional_args = []

  additional_args = []





  # Prepare custom images.

  # Prepare custom images.