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

am: 21a26c9843

Change-Id: I656c817338e6b1921213478cdb4f98923561487e
This commit is contained in:
Sen Jiang 2018-01-12 22:14:30 +00:00 committed by android-build-merger
commit 64e3da49be
1 changed files with 5 additions and 0 deletions

View File

@ -1309,6 +1309,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"