From 914361a3ddba1d2ff2e631d4990098e9b21844db Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2016 15:14:36 -0700 Subject: "M4B30Q" --- 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 df6c9c4..fb70c8d 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. -export BUILD_ID=MOB30P +export BUILD_ID=M4B30Q -- cgit v1.1 From 2d1cc1933c123230550bab62e2ce8a8b32bc07f3 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 16 Aug 2016 15:52:48 -0700 Subject: M4B30R --- 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 fb70c8d..2c6ea87 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. -export BUILD_ID=M4B30Q +export BUILD_ID=M4B30R -- cgit v1.1 From 91fb2481daa0e6b7becd005b9e8d0e0786d4d568 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 17 Aug 2016 15:02:49 -0700 Subject: M4B30S --- 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 2c6ea87..0fe0dc7 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. -export BUILD_ID=M4B30R +export BUILD_ID=M4B30S -- cgit v1.1 From 83290b9720d01bbda5230a86e6072064d04f0b37 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Fri, 26 Aug 2016 16:22:11 -0700 Subject: M4B30T --- 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 0fe0dc7..e9b9179 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. -export BUILD_ID=M4B30S +export BUILD_ID=M4B30T -- cgit v1.1 From 146e3a5c48b60c3b95e6052e8f5728a763d8a862 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 10:33:30 -0700 Subject: Update Security String to 2016-10-01 to platform and CTS for October Security Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684 (cherry picked from commit cb60b2dedbf6a346f3affc66a2e89a8068c530e2) --- core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index e9b9179..336f112 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. -export BUILD_ID=M4B30T +export BUILD_ID=M4B30U diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cb8ba51..1b3c7d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-10-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From cad4c75affe36c9d8b7f89f947759789f2e96620 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 14:11:04 -0700 Subject: Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) b/30946906 Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d --- 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 1b3c7d8..558a035 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-01 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From c952e8f818c153f2db42da642e1ab57bd466c668 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 25 Aug 2016 15:24:56 -0700 Subject: Update comments around PLATFORM_SECURITY_LEVEL Bug: 29881091 Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6 --- core/version_defaults.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..068ed0e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,9 +100,11 @@ endif ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Used to indicate the security patch that has been applied to the device. - # Can be an arbitrary string, but must be a single word. - # - # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # 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 := 2016-10-05 endif -- cgit v1.1 From fac97b6812d671d9dee800cf8bde3ea4714835af Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 30 Aug 2016 17:49:20 -0700 Subject: M4E61 --- 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 e9b9179..361f7ce 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. -export BUILD_ID=M4B30T +export BUILD_ID=M4E61 -- cgit v1.1 From cf4d1c7d32d3d93866fecc780d8d6740d24bd425 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 30 Aug 2016 17:52:09 -0700 Subject: M4B30V --- 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 361f7ce..8800b51 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. -export BUILD_ID=M4E61 +export BUILD_ID=M4B30V -- cgit v1.1 From 312b8987f310db204df67d1c71b0890d8b618bea Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 10:33:30 -0700 Subject: Update Security String to 2016-10-01 to platform and CTS for October Security Fix merge conflict into mmr3 Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684 --- 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 cb8ba51..1b3c7d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-10-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From e3ab148bd9cf2c542ed1869d13e718a9c0f10ab8 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 14:11:04 -0700 Subject: Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) b/30946906 Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d (cherry picked from commit bb45bd20e97be07ec92facf411aae91d90490a5b) --- 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 1b3c7d8..558a035 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-01 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 8f69770b6b59af6f5e1f297155c0ecc561e33790 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 25 Aug 2016 15:24:56 -0700 Subject: Update comments around PLATFORM_SECURITY_LEVEL Bug: 29881091 Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6 (cherry picked from commit f45494279a4f46c51ce26935e221a121262f49ee) --- core/version_defaults.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..068ed0e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,9 +100,11 @@ endif ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Used to indicate the security patch that has been applied to the device. - # Can be an arbitrary string, but must be a single word. - # - # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # 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 := 2016-10-05 endif -- cgit v1.1 From ce897e21470ee791f15b4790342ceea3efdca405 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 31 Aug 2016 11:18:24 -0700 Subject: M4B30W --- 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 8800b51..f31e797 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. -export BUILD_ID=M4B30V +export BUILD_ID=M4B30W -- cgit v1.1 From c00b2e72aa21fd862c814c33722674113e0c6d9b Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 31 Aug 2016 16:48:30 -0700 Subject: M4B30X --- 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 f31e797..e6bb0d7 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. -export BUILD_ID=M4B30W +export BUILD_ID=M4B30X -- cgit v1.1