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

Commit 49fadf41 authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Fix secondary payload generation 

Secondary payload is already handled by creating a new instance of
PayloadGenerator, when creating PayloadGenerator for primary payload,
we should not include the OPTIONS.secondary parameter.

Bug: 270100752
Test: ota_from_target_files --include_secondary
Change-Id: I908043bad11aa6d47dc4dc9b61da460fcfa4f0b9
parent 0452128f

tools/releasetools/ota_from_target_files.py

+2 −1
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ 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



  additional_args = []



  # Prepare custom images.
@@ -923,7 +924,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.