From 0e2b039c6b30c8f02c0dda9779f4a2327a8ebab9 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Wed, 18 Apr 2018 14:15:56 -0700 Subject: DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05 Bug:78240102 Change-Id: Ib9d8c11ecf9212711a9679972c15354c8dd56857 (cherry picked from commit 85a18252b7c7dd1657a067a91edeac14da6a2a51) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a15537e4b1..efe68764fe 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,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 := 2018-05-05 + PLATFORM_SECURITY_PATCH := 2018-06-05 endif ifndef PLATFORM_BASE_OS -- cgit v1.2.3 From 19113a0ebbc1062fdbc78d6ddbae2a34624e3b09 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Wed, 16 May 2018 16:26:08 -0700 Subject: DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349 (cherry picked from commit cfbe84b8a0ac6ad680edad1c21b08672ed96127d) Change-Id: I6c0f64fb8c7d430605b64e174c99d68260fda556 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index efe68764fe..e23b9af30c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,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 := 2018-06-05 + PLATFORM_SECURITY_PATCH := 2018-07-05 endif ifndef PLATFORM_BASE_OS -- cgit v1.2.3 From aa5ffb9a88a361f13bcc6b393c34909ef082cb91 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 18 Jun 2018 09:38:40 -0700 Subject: [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 (cherry picked from commit f6bee62b8eb5819f23e31d1dfb1622d48f5ab554) Change-Id: Ie15d759058f0ae32a09f3d106ceb92be324d59a3 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e23b9af30c..395442e2b6 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,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 := 2018-07-05 + PLATFORM_SECURITY_PATCH := 2018-08-05 endif ifndef PLATFORM_BASE_OS -- cgit v1.2.3