Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev

2018-01-13 00:13:58 +00:00
parent c3aee02b03 d364541fb9
commit 258f04a556
1 changed files with 5 additions and 0 deletions
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1237,6 +1237,11 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
         "--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"