commit 51d95fc646feeb717e25a517ac37dbdc47346bff
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 07 23:07:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 07 23:07:01 2022 +0000
tree b1c453434ac3260114b7ef4fc392dceb296b1d4c
parent ac95deb6b09aceea94a25d49b759ae2af6e176d9
parent c10c51039eb2fc9a0ff92bee913677b0b36ffaab

Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e

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

Change-Id: Iefb5d275489b9c5adce2e5a621557d06326322d1

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