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

Commit f9d37449 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Allow downgradeable secondary payload" am: 072efc92 am: 8fb571fe... 

Merge "Allow downgradeable secondary payload" am: 072efc92 am: 8fb571fe am: 3d9728ef am: 76c6a175

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

Change-Id: I4788057c793d5be869f514ff1e8e9eda941b3e9f
parents fc0f67f5 76c6a175

tools/releasetools/ota_from_target_files.py

+1 −7
Original line number Diff line number Diff line
@@ -1060,15 +1060,9 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    secondary_target_file = GetTargetFilesZipForSecondaryImages(

        target_file, OPTIONS.skip_postinstall)

    secondary_payload = Payload(secondary=True)

    assert not OPTIONS.downgrade

    partition_timestamps_flags = GeneratePartitionTimestampFlags(

      [part

       for part in metadata.postcondition.partition_state

       if part.partition_name not in SECONDARY_PAYLOAD_SKIPPED_IMAGES]

    )

    secondary_payload.Generate(secondary_target_file,

                               additional_args=["--max_timestamp",

                               max_timestamp]+partition_timestamps_flags)

                               max_timestamp])

    secondary_payload.Sign(payload_signer)

    secondary_payload.WriteToZip(output_zip)