aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-21 21:05:40 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-21 21:05:46 +0000
commit7079775feb55cbded59a6b0b50f5317e7f16a81d (patch)
tree4d8f67d9af4547a1e51f1fb94cddc5cef7ac5f83
parent4421dead89a3b0c70a52fbf6dd709f11cd1fe1b1 (diff)
parent19b20f32c302115b33b0a9768825cb76fd310aea (diff)
downloadbuild-7079775feb55cbded59a6b0b50f5317e7f16a81d.tar.gz
Make change and version bump to SPM2.220819.035android-platform-12.1.0_r20
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24426048'] into sc-v2-platform-release. Change-Id: Ia1892b89830edc1ac2f1cc485140ead153136a7b
-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 0c3c48afeb..42abf6b9fa 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=SPM2.220819.034
+BUILD_ID=SPM2.220819.035
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 850f53f216..fa3febd18a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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 := 2023-09-01
+ PLATFORM_SECURITY_PATCH := 2023-10-01
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH