StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Specify --max_timestamp when calling brillo_update_payload.

Browse Source 
Bug: 36232423
Test: Create OTA packages (full, incremental and downgrade) with
      ota_from_target_files.py; check the parameters passed down to
      brillo_update_payload.
Change-Id: I3af397f05fe16f4a9f0eb73e8272bac6afdc002a
Merged-In: I3af397f05fe16f4a9f0eb73e8272bac6afdc002a
(cherry picked from commit ed08bc4a22)
This commit is contained in:
Tao Bao
2017-10-03 14:17:57 -07:00
parent c3389033d6
commit d21de1b1c3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/ota_from_target_files.py
View File

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