aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-10-12 01:34:02 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-10-12 01:34:02 +0000
commitc5cc25f4ef4e92060df411373afb296864be4de7 (patch)
tree7e3e5903a711023bbd4e40903b943fb8e15a6dfa
parent9036017e77c1738c5d4f0bfed861f2e06a2313d5 (diff)
parentff482bb09c99695112c2c676340296cce2718ad7 (diff)
downloadbuild-android-mainline-12.0.0_r28.tar.gz
Snap for 7814173 from ff482bb09c99695112c2c676340296cce2718ad7 to mainline-ipsec-releaseandroid-mainline-12.0.0_r28
Change-Id: I2faf1772e3965886d763ebc36d476071025ce90c
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 2f9c3f3bf1..84429d27d3 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
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b4329f7ebe..dbc32e1157 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -246,7 +246,7 @@ ifndef PLATFORM_SECURITY_PATCH
# 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