Merge "Allow downgradeable secondary payload" am: 072efc92e2 am: 8fb571feb5

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

Change-Id: Ia4fcc632fae2a468c0f99fc57009431388470e17
This commit is contained in:
Kelvin Zhang
2020-11-14 03:35:53 +00:00
committed by Automerger Merge Worker

View File

@@ -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)