From ef1bcc1f9a474ae279e62f64862cb80be7c8c7b1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 9 Sep 2021 22:02:07 +0000 Subject: Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" This reverts commit bf70d0ba2a2fb85d761a0b9a0b538806bc8cc95c. Reason for revert: camera prebuilt fixed to support short BUILD_ID Bug: 196178071 Change-Id: Idcb57daf31907f1dff615e180790a2f52462b430 Merged-In: I3b7166d28df6d8828f895f839186de78592d259e --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2f9c3f3bf1..84429d27d3 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=MASTER +BUILD_ID=SC -- cgit v1.2.3 From 0449bb97faa8cf3f2159b10a2e994249f546b488 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 13 Sep 2021 22:29:09 +0000 Subject: [DO NOT MERGE] Update Security String to 2021-11-05 Bug: 199784479 Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450 Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450 --- 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 85f63c906c..4c83227778 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-10-05 + PLATFORM_SECURITY_PATCH := 2021-11-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH -- cgit v1.2.3 From bdb63576ffe7b88514053441ba96f9dc4c33cbe6 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 16 Sep 2021 19:03:06 +0000 Subject: Update Security String to 2021-11-01 Bug: 199784479 Change-Id: Iaf0b0863f6a4e667a5a8f291e1252d8d2dff1ec6 Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450 --- 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 683cc4ded5..437c173043 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,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-10-01 + PLATFORM_SECURITY_PATCH := 2021-11-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP -- cgit v1.2.3