From 8c3565d98de92490d4e3a7069941458d0e94535a Mon Sep 17 00:00:00 2001 From: Mac Wang Date: Thu, 5 Jul 2018 15:46:08 +0800 Subject: [PATCH 01/41] Add product_launched_with_k.mk Bug: 25564210 Test: None Change-Id: I2afabf6d7720e9f1026f86598c4f6bc392a1c888 --- target/product/product_launched_with_k.mk | 2 ++ target/product/product_launched_with_l.mk | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 target/product/product_launched_with_k.mk diff --git a/target/product/product_launched_with_k.mk b/target/product/product_launched_with_k.mk new file mode 100644 index 0000000000..87faa12a67 --- /dev/null +++ b/target/product/product_launched_with_k.mk @@ -0,0 +1,2 @@ +#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on. +PRODUCT_SHIPPING_API_LEVEL := 19 diff --git a/target/product/product_launched_with_l.mk b/target/product/product_launched_with_l.mk index 6e782f7986..4e79749a3d 100644 --- a/target/product/product_launched_with_l.mk +++ b/target/product/product_launched_with_l.mk @@ -1,3 +1,2 @@ #PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on. PRODUCT_SHIPPING_API_LEVEL := 21 - From adff35964055d44af08a037b7cc0b47839784be0 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 27 Jul 2018 03:15:58 +0000 Subject: [PATCH 02/41] Version bump to PQ1A.180727.001 Change-Id: I917e56aed0af0270449bec17471f74abdc569240 --- 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 932e2144a7..61b62f8571 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=PI +export BUILD_ID=PQ1A.180727.001 From 61ddf1fa27039bc83a7e4be48a35a50ab2b83c78 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 13 Aug 2018 09:34:24 -0700 Subject: [PATCH 03/41] Update platform security string to 2018-10-05 on pi-dev & master bug: 112535135 --- 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 3c1c3c913b..3199c09ca2 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 := 2018-09-05 + PLATFORM_SECURITY_PATCH := 2018-10-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 090027fb461c2a8ed1d3277da4f01e11565865ed Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 13 Aug 2018 11:12:19 -0700 Subject: [PATCH 04/41] DO NOT MERGE Update platform security string to 2018-10-05 bug:112535135 --- 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 a4185b1ed7..4dee6f00c5 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-09-05 + PLATFORM_SECURITY_PATCH := 2018-10-05 endif ifndef PLATFORM_BASE_OS From a113745d1f15a358f427e9997490099e34807377 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 14 Aug 2018 13:13:47 -0700 Subject: [PATCH 05/41] Track more static dependencies for notice files Track transitive static dependencies of native binaries, and and direct and transitive static dependencies of java and app modules. Bug: 112331930 Test: m checkbuild Change-Id: I0e19971033d6254bfbb6555f0e68fd5e529569c6 Merged-In: I0e19971033d6254bfbb6555f0e68fd5e529569c6 (cherry picked from commit 579668b122d88b9c810238412ab003192bf15d2b) --- core/binary.mk | 8 +++----- core/java_common.mk | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 954df1f445..61cd5cf73f 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1587,6 +1587,9 @@ installed_static_library_notice_file_targets := \ $(foreach lib,$(my_static_libraries) $(my_whole_static_libraries), \ NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib)) +$(notice_target): | $(installed_static_library_notice_file_targets) +$(LOCAL_INSTALLED_MODULE): | $(notice_target) + # Default is -fno-rtti. ifeq ($(strip $(LOCAL_RTTI_FLAG)),) LOCAL_RTTI_FLAG := -fno-rtti @@ -1783,11 +1786,6 @@ all_libraries := \ $(built_static_libraries) \ $(built_whole_libraries) -# Also depend on the notice files for any static libraries that -# are linked into this module. This will force them to be installed -# when this module is. -$(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets) - ########################################################### # Export includes ########################################################### diff --git a/core/java_common.mk b/core/java_common.mk index 2b85dc145b..8f4611eed5 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -422,6 +422,21 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_sh ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR) + +########################################################## +# Copy NOTICE files of transitive static dependencies +# Don't do this in mm, since many of the targets won't exist. +ifeq ($(ONE_SHOT_MAKEFILE),) +installed_static_library_notice_file_targets := \ + $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \ + NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-JAVA_LIBRARIES-$(lib)) +else +installed_static_library_notice_file_targets := +endif + +$(notice_target): | $(installed_static_library_notice_file_targets) +$(LOCAL_INSTALLED_MODULE): | $(notice_target) + ########################################################### # Verify that all libraries are safe to use ########################################################### From f82a328141759d2ef672577934436acc8173f953 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 24 Aug 2018 22:01:22 +0000 Subject: [PATCH 06/41] Version bump to PQ1A.180824.002 Change-Id: I1e3748d29da864f90f11ccee9e28fb4e7840c571 --- 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 a5bea2fdc4..3ad4d58964 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=PQ1A.180824.001 +export BUILD_ID=PQ1A.180824.002 From 45a70dd5a4f470633f0b983cec602a2b1c2167ab Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 24 Aug 2018 22:57:41 +0000 Subject: [PATCH 07/41] Version bump to PQ1A.180824.003 Change-Id: I6e56000dcfd0dac22705d8b27b2d12508786efba --- 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 3ad4d58964..1fad23d4cd 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=PQ1A.180824.002 +export BUILD_ID=PQ1A.180824.003 From 876e565e7d9cdde31c5273c62f6cdfab6e33733f Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 28 Aug 2018 01:57:43 +0000 Subject: [PATCH 08/41] Version bump to PQ1A.180824.004 Change-Id: I70f5cc40c09d094682e38a29c077edceab9dcb52 --- 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 1fad23d4cd..741e871311 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=PQ1A.180824.003 +export BUILD_ID=PQ1A.180824.004 From 945442b156855a3d40b1bff46b1d355a75e6be30 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 28 Aug 2018 04:22:20 +0000 Subject: [PATCH 09/41] Version bump to PQ1A.180824.005 Change-Id: Ia6aa71d667560446c8c668a893a87fab2363814a --- 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 741e871311..932a8c906c 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=PQ1A.180824.004 +export BUILD_ID=PQ1A.180824.005 From b9dbc5248d5fe491be731c10848d95f6fc77949f Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 28 Aug 2018 19:21:40 +0000 Subject: [PATCH 10/41] Version bump to PQ1A.180824.006 Change-Id: I68b4ac3017d5ca1c2274075102c69d50c1bf051a --- 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 932a8c906c..71f5ee48fe 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=PQ1A.180824.005 +export BUILD_ID=PQ1A.180824.006 From d77732f6218595e7bea4f2da4e1c89c98d55fb9e Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 29 Aug 2018 21:55:12 +0000 Subject: [PATCH 11/41] Version bump to PQ1A.180829.002 Change-Id: I52741f1e002b7bb3712d0256c5f8482d97f03ec9 --- 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 71f5ee48fe..e8532ec69e 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=PQ1A.180824.006 +export BUILD_ID=PQ1A.180829.002 From 29a403c99786924564eace8a05df145b219e7ca1 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 30 Aug 2018 04:03:06 +0000 Subject: [PATCH 12/41] Version bump to PQ1A.180829.003 Change-Id: I5db12a96587363a6c6cef92c0105f5d9c75ea4a0 --- 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 e8532ec69e..a290e1a986 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=PQ1A.180829.002 +export BUILD_ID=PQ1A.180829.003 From 8d80a97de4a37f040113ad0f54bab7c08c633e12 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 31 Aug 2018 04:27:29 +0000 Subject: [PATCH 13/41] Version bump to PQ1A.180829.004 Change-Id: I5b2e6f0ef333e7220b9243f4382cc2e925893a44 --- 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 a290e1a986..04022bd5f9 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=PQ1A.180829.003 +export BUILD_ID=PQ1A.180829.004 From cb30f9d83aecae87ee43cc05194b2bef748a14a4 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 5 Sep 2018 23:36:14 +0000 Subject: [PATCH 14/41] Version bump to PQ1A.180829.005 Change-Id: I1db4c1e8b98a1a59a8fcbc11a5806e1f34a62b9b --- 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 04022bd5f9..0984ad343b 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=PQ1A.180829.004 +export BUILD_ID=PQ1A.180829.005 From 95212e441073530fb240c30354d4b2b2bb420416 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 7 Sep 2018 01:09:33 +0000 Subject: [PATCH 15/41] Version bump to PQ1A.180829.006 Change-Id: I6f759740d8a7759f3437efcbc3837271961a1463 --- 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 0984ad343b..5076737b01 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=PQ1A.180829.005 +export BUILD_ID=PQ1A.180829.006 From 3e587b55b929e9da5b1892aa931258e2212d9a32 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 14:47:53 -0700 Subject: [PATCH 16/41] Update platform security string to 2018-11-01 on pi-dev & master Bug:114110585 (cherry picked from commit 2e6c06ba1b01fd0b9af8d955ae28da6b39037c85) Change-Id: Ic1e2d648daa0c28d7d203e44fd6bbe0f705e4eab --- 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 3199c09ca2..18cf0028dc 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 := 2018-10-05 + PLATFORM_SECURITY_PATCH := 2018-11-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 5d1f2a53ef9bc6bee3f31d85066f70c321046674 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 14:51:33 -0700 Subject: [PATCH 17/41] Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585 (cherry picked from commit dd737c096146a5e3507b1b703c6be62b1db391c0) Change-Id: I0e8d07c6d7333414c6099f718a122d7b343d8e92 --- 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 18cf0028dc..d2df00e22d 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 := 2018-11-01 + PLATFORM_SECURITY_PATCH := 2018-11-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From de7bf957a9ac654273dc9a62f6d1c4f615b609c9 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Mon, 10 Sep 2018 22:57:35 +0000 Subject: [PATCH 18/41] Revert "Update platform security string to 2018-11-05 on pi-dev & master" This reverts commit dd737c096146a5e3507b1b703c6be62b1db391c0. Reason for revert: Security String needs to be temporary reverted to cut a new 11-01 build Change-Id: I36e0f4de0c4158711fcc7a1f383129b8f3f889a1 (cherry picked from commit ad151b50f3b51022896ae674970a203b3f4c681e) --- 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 d2df00e22d..18cf0028dc 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 := 2018-11-05 + PLATFORM_SECURITY_PATCH := 2018-11-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From e582c47011b5dce2aac9388ee457ca33f440690e Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 10 Sep 2018 23:34:12 +0000 Subject: [PATCH 19/41] Version bump to PQ1A.181105.005 Change-Id: I3cd26b4e52eb47ce45fb52536abbcdcdb782a8c3 --- 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 5898a67860..caff17500d 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=PQ1A.181101.004 +export BUILD_ID=PQ1A.181105.005 From 6e99c58ef482bafb3b2be90163e499997aa2ad3d Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 11 Sep 2018 16:35:38 +0000 Subject: [PATCH 20/41] Version bump to PQ1A.181105.006 Change-Id: I78563fc056f1a34d918a66c8deded9678881f98c --- 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 caff17500d..a76ea46b9e 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=PQ1A.181105.005 +export BUILD_ID=PQ1A.181105.006 From 54810589aae5b839c8128e6ede6ec397ba505077 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 11 Sep 2018 18:32:04 +0000 Subject: [PATCH 21/41] Version bump to PQ1A.181105.007 Change-Id: I5d5db4349bf2cdd1a1ee04080ddc2f27c444842f --- 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 a76ea46b9e..6224361476 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=PQ1A.181105.006 +export BUILD_ID=PQ1A.181105.007 From 17236b90a81b95e7337173e5d3826fa86f0dd86a Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 14:51:33 -0700 Subject: [PATCH 22/41] Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585 (cherry picked from commit dd737c096146a5e3507b1b703c6be62b1db391c0) Change-Id: Idaa3e14b642321aea09bfe2dd68dbdb71957a3c3 --- 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 18cf0028dc..d2df00e22d 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 := 2018-11-01 + PLATFORM_SECURITY_PATCH := 2018-11-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 6b64578252527ce046aea99eb0c196fca75bd1cc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 12 Sep 2018 17:16:01 +0000 Subject: [PATCH 23/41] Version bump to PQ1A.181105.009 Change-Id: Ib146c931b2a4edee5e0f6b212a0bb7fee4d36683 --- 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 d42717a942..07b36a77a8 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=PQ1A.181105.008 +export BUILD_ID=PQ1A.181105.009 From 76435aa000d82b33b911106f295c99f956427f61 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 17 Sep 2018 22:15:44 +0000 Subject: [PATCH 24/41] Version bump to PQ1A.181105.010 Change-Id: I6b7a3bc1faf60497ed0a56b3df480d9c40efe4cc --- 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 07b36a77a8..77a39d8c2f 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=PQ1A.181105.009 +export BUILD_ID=PQ1A.181105.010 From fe21655b522405531f13fbbf1d35ddcc114ed712 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 20 Sep 2018 19:06:12 +0000 Subject: [PATCH 25/41] Version bump to PQ1A.181105.011 Change-Id: I4764c0ffaf5aa342305810652e4522d2fa89581d --- 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 77a39d8c2f..b757af75b9 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=PQ1A.181105.010 +export BUILD_ID=PQ1A.181105.011 From b964ecfed1fb481c42fa33fd146f6f42d1fd53b9 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Sun, 23 Sep 2018 16:47:36 +0000 Subject: [PATCH 26/41] Version bump to PQ1A.181105.012 Change-Id: Ib353386a8da7d1b30086fdded51009e9db7c2fd4 --- 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 b757af75b9..db373fe684 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=PQ1A.181105.011 +export BUILD_ID=PQ1A.181105.012 From 310f8241d0e1c6a3e20914205978ecc680c3fbb1 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 24 Sep 2018 22:16:53 +0000 Subject: [PATCH 27/41] Version bump to PQ1A.181105.013 Change-Id: Icda1903479462e315e1fba086438fa51378238c5 --- 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 db373fe684..d51f44e1e3 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=PQ1A.181105.012 +export BUILD_ID=PQ1A.181105.013 From e9896a5b5f93c7b8abc2ba1557e2aa7b96264b04 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 28 Sep 2018 23:14:18 +0000 Subject: [PATCH 28/41] Version bump to PQ1A.181105.014 Change-Id: I90f724e01120b979cebca0e751f2131af864f6ad --- 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 d51f44e1e3..cca8fd8ab2 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=PQ1A.181105.013 +export BUILD_ID=PQ1A.181105.014 From d10e6651dcd98ac353a7f77d5b021eee4d940110 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 2 Oct 2018 18:40:57 +0000 Subject: [PATCH 29/41] Version bump to PQ1A.181105.015 Change-Id: Iaca07acaddc846ed3e52d8be19d5612b417fc43f --- 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 cca8fd8ab2..81b8b424e1 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=PQ1A.181105.014 +export BUILD_ID=PQ1A.181105.015 From 8c3b43718628e4f5183c6998b35fb011e4b8adae Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 5 Oct 2018 00:39:54 +0000 Subject: [PATCH 30/41] Version bump to PQ1A.181105.016 Change-Id: Ib8580ede65f721373b53b6050084cc871a9b7867 --- 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 81b8b424e1..71e0e4cf80 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=PQ1A.181105.015 +export BUILD_ID=PQ1A.181105.016 From 50f56547c8976b4bd0fae0d9d39234ea93460c85 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 5 Oct 2018 23:18:17 +0000 Subject: [PATCH 31/41] Version bump to PQ1A.181105.017 Change-Id: I084629194e9d3f995e08e75c156d19730fa8b32f --- 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 71e0e4cf80..907e38cf65 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=PQ1A.181105.016 +export BUILD_ID=PQ1A.181105.017 From 41abbc1278b12299b2924b56c7ed6e9730d08803 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 13:41:15 -0700 Subject: [PATCH 32/41] [DO NOT MERGE] Update Security String to 2018-12-01 for December Release bug:117667960 (cherry picked from commit d6edd2123ce5f3ef100657c0a416d25bc4de81b7) Change-Id: I92db5581f988978254df2ad2da7307c21e699d3e --- 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 d2df00e22d..e8edf6a09e 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 := 2018-11-05 + PLATFORM_SECURITY_PATCH := 2018-12-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 929cf3da838935a82e5fdc7278af6e630a2387f9 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Oct 2018 22:27:00 +0000 Subject: [PATCH 33/41] Version bump to PQ1A.181105.017.A1 Change-Id: I67c2a1db40cddbe953d3c450dc9520a1ea664d9d --- 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 907e38cf65..5b879c3fd2 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=PQ1A.181105.017 +export BUILD_ID=PQ1A.181105.017.A1 From 1ddd691aed96b6567ad7f48e613a013e43d5791f Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 13:42:41 -0700 Subject: [PATCH 34/41] [DO NOT MERGE]Update Security String to 2018-12-05 for December release bug: 117667960 (cherry picked from commit 1e6d1d603badde694db0e1ce748088c431a328ae) Change-Id: I8434e940ea45b3d133670b67e16e8cb2224f2323 --- 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 e8edf6a09e..f837260d63 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 := 2018-12-01 + PLATFORM_SECURITY_PATCH := 2018-12-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 8380ffa65d039d509e2f4fc1c6f383b72a6b9b22 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 23 Oct 2018 16:32:12 +0000 Subject: [PATCH 35/41] Version bump to PQ1A.181205.002 Change-Id: Ibc9ed5c3f3a489980cd15ebc4382cb5fe4991ddc --- 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 d65c830649..069b31796e 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=PQ1A.181205.001 +export BUILD_ID=PQ1A.181205.002 From b8f83a68bdabf06f5a463582685a2ce4de4d3e2f Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 26 Oct 2018 20:58:07 +0000 Subject: [PATCH 36/41] Version bump to PQ1A.181205.003 Change-Id: Ic949f5e34ca4d432d8928a74533c765025e66b07 --- 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 069b31796e..daf972be55 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=PQ1A.181205.002 +export BUILD_ID=PQ1A.181205.003 From 1c9dc3fea59d6476d32f38b99814f018f5eda068 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 29 Oct 2018 17:37:06 +0000 Subject: [PATCH 37/41] Version bump to PQ1A.181205.004 Change-Id: I6e488a54540131d13b54302649d3b12651611c50 --- 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 daf972be55..ba84b06a60 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=PQ1A.181205.003 +export BUILD_ID=PQ1A.181205.004 From bd5d908c43c77e4b998aa610698bc5b2414858f4 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 29 Oct 2018 17:49:51 +0000 Subject: [PATCH 38/41] Version bump to PQ1A.181205.005 Change-Id: Ie9b19d64d3c072624f239dbf294ac882c0a45a82 --- 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 ba84b06a60..1ef62a1399 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=PQ1A.181205.004 +export BUILD_ID=PQ1A.181205.005 From 2f95f070eb5cc1b4e988ca13f4fa632d33425d93 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 2 Nov 2018 21:01:10 +0000 Subject: [PATCH 39/41] Version bump to PQ1A.181205.006 Change-Id: I8431aebd92ec9e2e5db6cd7aca26cd8f8f3ab892 --- 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 1ef62a1399..f7d88439c0 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=PQ1A.181205.005 +export BUILD_ID=PQ1A.181205.006 From f8efe99d0c20119f18316aac89b40eeef3e62bfd Mon Sep 17 00:00:00 2001 From: Bill Rassieur Date: Thu, 29 Nov 2018 13:34:41 -0800 Subject: [PATCH 40/41] Set RC Name to PPRL.181105.017. BUG: 119059929 --- 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 5b879c3fd2..a428cc7054 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=PQ1A.181105.017.A1 +export BUILD_ID=PPRL.181105.017 From 4a676aaa3a9a43419d1491697e97ef63592315b1 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 7 Dec 2018 02:58:18 +0000 Subject: [PATCH 41/41] Version bump to PPRL.181205.001 Change-Id: I9174bab704afa3ff85be5236be16d15f66446bb4 --- 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 935ab68f6c..67c2a1fdba 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=PPRL.181205.006 +export BUILD_ID=PPRL.181205.001