commit ea43cfbea1dae3d9021120c0223225e41e204d64
author Sen Jiang <senj@google.com> Fri Jan 12 22:23:21 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 12 22:23:21 2018 +0000
tree ec155b99aa174d9a7257628d0d077c02f322a27f
parent 82b90c8110f7a906b8e14edb733d948bc65888a2
parent ed62f299b5c17daf90d3d5333b269bca1d50a6e2

Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be
am: ed62f299b5

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690

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 199e700..9bd7fb6 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1326,6 +1326,11 @@
          "--target_image", target_file]
   if source_file is not None:
     cmd.extend(["--source_image", source_file])
+  if OPTIONS.downgrade:
+    max_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)
+  else:
+    max_timestamp = metadata["post-timestamp"]
+  cmd.extend(["--max_timestamp", max_timestamp])
   p1 = common.Run(cmd, stdout=subprocess.PIPE)
   p1.wait()
   assert p1.returncode == 0, "brillo_update_payload generate failed"