commit d31e97cc6d180ee1dcdab24917da6e6d26db3a71
author Yi-yo Chiang <yochiang@google.com> Tue Jan 11 07:37:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 11 07:37:07 2022 +0000
tree 52a6f854cfb150e083646f7c6602a92b8a456a94
parent 9212d765d18b92ddc6ede6538ffe2848c52b4d82
parent 85128a7fa05ea0b3f99c79576fee5747c286f277

Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0

Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I4330eb68f30d31fa74c4e0f9bf980d1768776928

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index ba5ca42..2f9c3f3 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.
 
-BUILD_ID=AOSP.MASTER
+BUILD_ID=MASTER

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 051de62..4dbc941 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,7 @@
     #  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 := 2022-01-05
+      PLATFORM_SECURITY_PATCH := 2022-02-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH