diff options
| author | Tao Bao <tbao@google.com> | 2017-10-03 14:17:57 -0700 |
|---|---|---|
| committer | Ryan Longair <rlongair@google.com> | 2018-01-17 16:50:47 -0800 |
| commit | b84fd0a45b50665e50acafed68b2451c640a7924 (patch) | |
| tree | ad056e17eca3e539d0e7f83414ed8586658c031a | |
| parent | 0d200259607444276ee21d325b271bdf0fe3b08d (diff) | |
| download | build-nougat-mr1-security-release.tar.gz | |
Specify --max_timestamp when calling brillo_update_payload.android-7.1.1_r61android-7.1.1_r60android-7.1.1_r59nougat-mr1.8-releasenougat-mr1-security-release
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 ed08bc4a2267c038ce4834fc65a6693a7e0223af)
(cherry picked from commit d21de1b1c3494e121149be0d1e155d0ef4bc08a5)
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index d3d4974ff7..919bd0352c 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1230,6 +1230,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" |