summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin F. Haggerty <haggertk@lineageos.org>2021-05-04 06:52:40 -0600
committerKevin F. Haggerty <haggertk@lineageos.org>2021-05-04 06:52:40 -0600
commit8d02a8a9fdd4e2fb771895e52c5d78910793d510 (patch)
tree0f290eabce977d858927a9d0eca9972662ba47e9
parent75b03c622a64c135b0d7dcd6cd42150fd3254554 (diff)
parent638a6cef89c8106d09f5f2e926a80533271d3216 (diff)
Merge tag 'android-11.0.0_r37' into staging/lineage-18.1_merge-android-11.0.0_r37
Android 11.0.0 Release 37 (RQ2A.210505.003) * tag 'android-11.0.0_r37': Version bump to RQ2A.210505.003 [core/build_id.mk] Version bump to RQ2A.210505.002 [core/build_id.mk] Update Security String to 2021-05-05 Version bump to RQ2A.210405.006 [core/build_id.mk] Change-Id: I8eaa4321af0139173a54e7c752dc4ebff127133f
-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 da28ececce..63aa55745f 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.210405.005
+BUILD_ID=RQ2A.210505.003
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e83b8b02be..b32474d021 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-04-05
+ PLATFORM_SECURITY_PATCH := 2021-05-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH