summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin F. Haggerty <haggertk@lineageos.org>2021-04-06 09:06:48 -0600
committerKevin F. Haggerty <haggertk@lineageos.org>2021-04-06 09:06:48 -0600
commit224d5a3c880b30101043658673500cc5f232f0b1 (patch)
tree2b2cc36ddb5560fe786ba366ef7b113e07349ff3
parent8505a1096888498027acd883c52670497c6c2921 (diff)
parentf1ea820b87dfefa6f0feb3b78c3a099100f62ae7 (diff)
Merge tag 'android-11.0.0_r34' into staging/lineage-18.1_merge-android-11.0.0_r34
Android 11.0.0 release 34 * tag 'android-11.0.0_r34': Version bump to RQ2A.210405.005 [core/build_id.mk] Version bump to RQ2A.210405.004 [core/build_id.mk] Version bump to RQ2A.210405.003 [core/build_id.mk] Version bump to RQ2A.210405.002 [core/build_id.mk] Update Security String to 2021-04-05 Version bump to RQ2A.210305.007 [core/build_id.mk] Change-Id: Ic58424e74d627b616fe58d7ee31fccc7eb4b55cf
-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 1274b8fd1e..da28ececce 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=RQ2A.210305.006
+BUILD_ID=RQ2A.210405.005
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 9c7ac2c8f5..e83b8b02be 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 := 2021-03-05
+ PLATFORM_SECURITY_PATCH := 2021-04-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH