commit 14b008d79fff1825647d13978a30493edaad6828
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 07 14:09:15 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 07 14:09:15 2021 +0000
tree 7e3e5903a711023bbd4e40903b943fb8e15a6dfa
parent 7528d1a873d94c614af2f393a23a8991768738f7
parent ff482bb09c99695112c2c676340296cce2718ad7

Snap for 7802582 from ff482bb09c99695112c2c676340296cce2718ad7 to mainline-art-release

Change-Id: Ic7fafff7ee47913b78a020b019070ac275b207d7

core/build_id.mk

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

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b4329f7..dbc32e1 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -246,7 +246,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-10-05
+      PLATFORM_SECURITY_PATCH := 2021-11-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH