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

Commit cee4ebf1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I674ad741,I908043ba 

* changes:
  Disable VABC xor if COW isn't compressed
  Fix secondary payload generation
parents cd10355f 88043be8

tools/releasetools/ota_from_target_files.py

+5 −1
Original line number Diff line number Diff line
@@ -897,6 +897,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
          (source_info is not None and not source_info.is_vabc_xor):

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

    OPTIONS.enable_vabc_xor = False



  if OPTIONS.vabc_compression_param == "none":

    logger.info("VABC Compression algorithm is set to 'none', disabling VABC xor")

    OPTIONS.enable_vabc_xor = False

  additional_args = []



  # Prepare custom images.
@@ -927,7 +931,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  # Metadata to comply with Android OTA package format.

  metadata = GetPackageMetadata(target_info, source_info)

  # Generate payload.

  payload = PayloadGenerator(OPTIONS.include_secondary, OPTIONS.wipe_user_data)

  payload = PayloadGenerator(wipe_user_data=OPTIONS.wipe_user_data)



  partition_timestamps_flags = []

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