commit c3e5165e8248c295c7f0070616fccff3b557379c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 28 18:41:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 28 18:41:44 2021 +0000
tree 6dd5c865f97c3a1bd13ab496e16b9c585817b4ea
parent 558f1668fc9a1678586b389fce15c2e2fe96f4ef
parent fe4b552210b9f4c549fc9cf80ce8c53a79b08712

Merge "Moving debug ramdisk resources under / of the ramdisk" am: 2c806a7c94 am: fe4b552210

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

Change-Id: I2c3b3271d25eb5e27dbe13af534a5353862a8fa0

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index ba5ca42..11f4a80 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=RVC

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4138277..717584d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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 := 2021-04-05
+      PLATFORM_SECURITY_PATCH := 2021-06-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH