commit 6cdf39168fc5717c5e3c8efabd05fc6fd74ad4cc
author Kelvin Zhang <zhangkelvin@google.com> Tue Nov 10 09:28:23 2020 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Wed Nov 11 14:23:00 2020 -0500
tree 93c76b955093a19f06aab4b7f3fa0abb3bababce
parent 83ea783146c953d559b2913c9a90e698ab4b667a

Allow downgradeable secondary payload

Test: treehugger
Bug: 172811557
Change-Id: I58f3123b9bc69342427f95250a5ee57ede4ac926

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 020e3ba..9b19389 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1060,15 +1060,9 @@
     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)