diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-22 20:36:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-22 20:37:23 +0000 |
| commit | 283a842a08fdbaf902fcf123b335999da14dbf87 (patch) | |
| tree | 10797c1cb725f23b45204333af26c85d40707530 | |
| parent | f3a7e87d0600296da425eafdf8bcd23c01d6f100 (diff) | |
| parent | 5928372ebe4c764ed107e8d86d3e03277c9a8e70 (diff) | |
| download | build-283a842a08fdbaf902fcf123b335999da14dbf87.tar.gz | |
Make change and version bump to NBD92T
Change-Id: I899a6dbdc8c6b61755a16dade497ac04845d5b26
| -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 3536c78b1a..d276d7e977 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=NBD92S +export BUILD_ID=NBD92T diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 0d9dc5d658..f39d5cade8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -114,7 +114,7 @@ ifeq "" "$(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-02-01 + PLATFORM_SECURITY_PATCH := 2018-03-01 endif ifeq "" "$(PLATFORM_BASE_OS)" diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index b69ddaceea..faf8f362a1 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1212,6 +1212,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" |