[automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours am: fd5bf79dfd -s ours
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I2f3de7e815758967f3a3f90426bb37820ad9cbd9
diff --git a/core/build_id.mk b/core/build_id.mk
index 84429d2..025970b 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=SC
+BUILD_ID=SC_QPR1
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4c83227..f429d7c 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -39,9 +39,9 @@
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
-DEFAULT_PLATFORM_VERSION := SP1A
-MIN_PLATFORM_VERSION := SP1A
-MAX_PLATFORM_VERSION := SP1A
+DEFAULT_PLATFORM_VERSION := SQ1A
+MIN_PLATFORM_VERSION := SQ1A
+MAX_PLATFORM_VERSION := SQ1A
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\
@@ -93,7 +93,7 @@
# These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.SP1A := REL
+PLATFORM_VERSION_CODENAME.SQ1A := REL
ifndef PLATFORM_VERSION_CODENAME
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
@@ -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-11-05
+ PLATFORM_SECURITY_PATCH := 2021-12-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH