openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: ed62f299b5

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690
This commit is contained in:
Sen Jiang 2018-01-12 22:23:21 +00:00 committed by android-build-merger
parent 82b90c8110 ed62f299b5
commit ea43cfbea1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/ota_from_target_files.py
View File

@ -1326,6 +1326,11 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
"--target_image", target_file] "--target_image", target_file]
if source_file is not None: if source_file is not None:
cmd.extend(["--source_image", source_file]) 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 = common.Run(cmd, stdout=subprocess.PIPE)
p1.wait() p1.wait()
assert p1.returncode == 0, "brillo_update_payload generate failed" assert p1.returncode == 0, "brillo_update_payload generate failed"