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

Commit 7eed0a0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Respect VABC Xor prop in ota_from_target_files" am: 1b181b06 

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

Change-Id: Iff3f9ec25737cd0293ee05efb87b9bff64475068
parents 9d15040d 1b181b06

tools/releasetools/common.py

+7 −0
Original line number Diff line number Diff line
@@ -448,6 +448,13 @@ class BuildInfo(object): 
        vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true"

    return vabc_enabled



  @property

  def is_vabc_xor(self):

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

    vabc_xor_enabled = vendor_prop and \

        vendor_prop.GetProp("ro.virtual_ab.compression.xor.enabled") == "true"

    return vabc_xor_enabled



  @property

  def vendor_suppressed_vabc(self):

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

tools/releasetools/ota_from_target_files.py

+3 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,9 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  if target_info.vendor_suppressed_vabc:

    logger.info("Vendor suppressed VABC. Disabling")

    OPTIONS.disable_vabc = True

  if not target_info.is_vabc_xor or OPTIONS.disable_vabc:

    logger.info("VABC XOR Not supported, disabling")

    OPTIONS.enable_vabc_xor = False

  additional_args = []



  # Prepare custom images.