commit 6734bccc4732ece3cd1ecaeb8452c9b98e4944b9
author Christian Wailes <chriswailes@google.com> Wed Apr 28 19:47:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 28 19:47:59 2021 +0000
tree 7bd2f21641bf092c0b1af6fe56135100e67bb687
parent c3e5165e8248c295c7f0070616fccff3b557379c
parent ce4ec046292d80bd235bd56dcc8b7c04006b9d0e

Merge "Update init.rc prebuilt handling" am: a6d2d8c79a am: ce4ec04629

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

Change-Id: I5c42fc5f2a89515a2298b52c21537429bb8569a4

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