diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-26 18:04:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-26 18:10:02 +0000 |
| commit | b83443e22fa292e31d8a9fa3d346cbdfb5be9c7a (patch) | |
| tree | e75032649fcaffdd166c00cb9c20e07d2bc51a74 | |
| parent | f4f0b45af495633bf560954275e16a0dd28be5eb (diff) | |
| parent | c0aa8b03bfe1dceb74f726768935f75f56e19767 (diff) | |
| download | build-b83443e22fa292e31d8a9fa3d346cbdfb5be9c7a.tar.gz | |
Make change and version bump to OPM4.171019.014
Change-Id: I357af9f041333075f68d3d26466d93933c4bacec
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index f62d708b55..0f79a94a24 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=OPM4.171019.013 +export BUILD_ID=OPM4.171019.014 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 23fb68e4d2..f03d9ba34e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2018-01-05 + PLATFORM_SECURITY_PATCH := 2018-03-05 endif ifndef PLATFORM_BASE_OS diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 1b0f68b73b..3baacdc9d5 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1077,6 +1077,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=log_file, stderr=subprocess.STDOUT) p1.communicate() assert p1.returncode == 0, "brillo_update_payload generate failed" |