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

Commit f175801f authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Fix bug where VABC xor is used on unsupported builds 

Test: th
Bug: 216426344
Change-Id: I352136eb5f261ee1ca1567530109e7623c5f978b
parent ee5ceff6

tools/releasetools/ota_from_target_files.py

+6 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,12 @@ 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:



  # Both source and target build need to support VABC XOR for us to use it.

  # Source build's update_engine must be able to write XOR ops, and target

  # build's snapuserd must be able to interpret XOR ops.

  if not target_info.is_vabc_xor or OPTIONS.disable_vabc or \

      (source_info is not None and not source_info.is_vabc_xor):

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

    OPTIONS.enable_vabc_xor = False

  additional_args = []