From 62a11cf698e948822752271a596466987b5c8e8a Mon Sep 17 00:00:00 2001 From: JP Sugarbroad Date: Thu, 19 Jul 2018 15:50:41 -0700 Subject: [PATCH 01/20] [RESTRICT AUTOMERGE] Remove build/libs There's only a single library, libhost, and it's only used by acp and atree in build/tools, move it there. Bug: 109817231 Change-Id: Ifa58e58958d90fad008eb87a7eef4876b57b9edd --- {libs/host => tools/libhost}/Android.mk | 0 {libs/host => tools/libhost}/CopyFile.c | 0 {libs/host => tools/libhost}/include/host/CopyFile.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {libs/host => tools/libhost}/Android.mk (100%) rename {libs/host => tools/libhost}/CopyFile.c (100%) rename {libs/host => tools/libhost}/include/host/CopyFile.h (100%) diff --git a/libs/host/Android.mk b/tools/libhost/Android.mk similarity index 100% rename from libs/host/Android.mk rename to tools/libhost/Android.mk diff --git a/libs/host/CopyFile.c b/tools/libhost/CopyFile.c similarity index 100% rename from libs/host/CopyFile.c rename to tools/libhost/CopyFile.c diff --git a/libs/host/include/host/CopyFile.h b/tools/libhost/include/host/CopyFile.h similarity index 100% rename from libs/host/include/host/CopyFile.h rename to tools/libhost/include/host/CopyFile.h From fd72eaab9194848393e293d0f7d66774487ca379 Mon Sep 17 00:00:00 2001 From: JP Sugarbroad Date: Thu, 19 Jul 2018 17:06:15 -0700 Subject: [PATCH 02/20] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move We're moving the platform/build repository down a level, then symlinking the directories and necessary files back into build/. So if we're still in build/, keep searching for Android.mk files, otherwise stop, since they'll be found through the symlinks. Bug: 109817231 Change-Id: I057957e9b201c14dee185f9c00df157f178d8a31 --- Android.mk | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Android.mk diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000000..a1455d4650 --- /dev/null +++ b/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +# We're relocating the build project to a subdirectory, then using symlinks +# to expose the subdirectories where they used to be. If the manifest hasn't +# been updated, we need to include all the subdirectories. +ifeq ($(LOCAL_PATH),build) +include $(call first-makefiles-under,$(LOCAL_PATH)) +endif From 2e6c06ba1b01fd0b9af8d955ae28da6b39037c85 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 14:47:53 -0700 Subject: [PATCH 03/20] Update platform security string to 2018-11-01 on pi-dev & master Bug:114110585 --- 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 dd737c096146a5e3507b1b703c6be62b1db391c0 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 14:51:33 -0700 Subject: [PATCH 04/20] Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585 --- 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 b703503c1d9f594b98314d408e5bed714673964c Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 10 Sep 2018 16:37:40 -0700 Subject: [PATCH 05/20] [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev Bug:114110585 --- 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 4dee6f00c5..d3b447766c 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-10-05 + PLATFORM_SECURITY_PATCH := 2018-11-01 endif ifndef PLATFORM_BASE_OS From 281cb3b1722cd97c1cbbf937d5289107da2bd818 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 10 Sep 2018 16:42:41 -0700 Subject: [PATCH 06/20] [DO NOT MERGE] Update platform security string to 2018-11-05 on oc-mr1-dev bug:114110585 --- 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 d3b447766c..1ffb951f16 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-11-01 + PLATFORM_SECURITY_PATCH := 2018-11-05 endif ifndef PLATFORM_BASE_OS From b43ff9d8f57c3e1b51325c4343fc22571670f94b Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 14:11:24 -0700 Subject: [PATCH 07/20] [DO NOT MERGE] Update platform security String to 2018-12-01 bug:117667960 --- 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 1ffb951f16..527d72308f 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-11-05 + PLATFORM_SECURITY_PATCH := 2018-12-01 endif ifndef PLATFORM_BASE_OS From 7af38a13f3d62517894bce9be025c14c79fcc49e Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 14:23:49 -0700 Subject: [PATCH 08/20] [DO NOT MERGE] Update platform security string to 2018-12-05 bug: 117667960 --- 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 527d72308f..2904da31dd 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-12-01 + PLATFORM_SECURITY_PATCH := 2018-12-05 endif ifndef PLATFORM_BASE_OS From d6edd2123ce5f3ef100657c0a416d25bc4de81b7 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 13:41:15 -0700 Subject: [PATCH 09/20] [DO NOT MERGE] Update Security String to 2018-12-01 for December Release bug:117667960 --- 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 1e6d1d603badde694db0e1ce748088c431a328ae Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Fri, 12 Oct 2018 13:42:41 -0700 Subject: [PATCH 10/20] [DO NOT MERGE]Update Security String to 2018-12-05 for December release bug: 117667960 --- 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 765844be09ca36c6eee32f9d709c5a076a8b01cd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Oct 2018 16:56:57 +0000 Subject: [PATCH 11/20] Version bump to PQ2A.181016.002 Change-Id: I87a439e6dc293a564281524ffc99382101ac1560 --- 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 26ca385d73..f2c1fd6da7 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=PQ2A.181016.001 +export BUILD_ID=PQ2A.181016.002 From 1ce690dda1aa7e65e55d21a92dd663a42f5aacff Mon Sep 17 00:00:00 2001 From: Lubo Hristov Date: Tue, 6 Nov 2018 13:59:10 -0800 Subject: [PATCH 12/20] [DO NOT MERGE] Security string update to 2019-01-01 bug:118903919 --- 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 f837260d63..5c041cd5df 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-05 + PLATFORM_SECURITY_PATCH := 2019-01-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 816323424638190a227c297c36aafd00ee3262fe Mon Sep 17 00:00:00 2001 From: Lubo Hristov Date: Tue, 6 Nov 2018 14:01:11 -0800 Subject: [PATCH 13/20] [DO NOT MERGE] Security string update to 2019-01-05 bug:118903919 --- 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 5c041cd5df..84e856f693 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 := 2019-01-01 + PLATFORM_SECURITY_PATCH := 2019-01-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From b9187a3f6a646bab665b07bccbaca762dd34ed41 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 19 Nov 2018 23:21:42 +0000 Subject: [PATCH 14/20] Version bump to PQ2A.181115.002 Change-Id: I21bcd6ad69be9b1edcf9eb323f390c3f9494228b --- 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 ce86e90667..25c1bf4cf2 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=PQ2A.181115.001 +export BUILD_ID=PQ2A.181115.002 From 5d916e957fbb8ebdd64bad7b6e46a03bdf543e71 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 30 Nov 2018 03:30:30 +0000 Subject: [PATCH 15/20] Version bump to PQ2A.181115.004 Change-Id: Idf94c6e62334230de786ac0fea9e87f62ef7867f --- 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 4b16c5fbdc..b905907470 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=PQ2A.181115.003 +export BUILD_ID=PQ2A.181115.004 From 2c89c60c65a472263e55e55e3880e53b09f8b7dc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Sat, 1 Dec 2018 16:38:38 +0000 Subject: [PATCH 16/20] Version bump to PQ2A.181115.005 Change-Id: I4254acb57a5d277d7dd75f4498eb56812c48d173 --- 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 b905907470..d09b29559e 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=PQ2A.181115.004 +export BUILD_ID=PQ2A.181115.005 From 7247a3ca1cf86acd4f7292dc98ff14577c014ac5 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Wed, 28 Nov 2018 12:02:02 -0800 Subject: [PATCH 17/20] [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 (cherry picked from commit 14b4156d8d9c8269a714096fbb85e15cb2762581) Change-Id: I913992d9e9f76c48b6bacbc95441a56187d967b1 --- 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 84e856f693..4e3dd40d83 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 := 2019-01-05 + PLATFORM_SECURITY_PATCH := 2019-02-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From f6edf31c61a4c679880bb2c832ea33539531523f Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Wed, 28 Nov 2018 12:10:19 -0800 Subject: [PATCH 18/20] [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 (cherry picked from commit a9c8e6165e201ba44c6fb485d4e73c43cb32175d) Change-Id: I1b9dcb2548176d418d435545ab38fbc4bdd3f16c --- 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 4e3dd40d83..57e5492f97 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 := 2019-02-01 + PLATFORM_SECURITY_PATCH := 2019-02-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 9bba258684bd43c15df925dce38f3022db039b6c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 5 Dec 2018 21:17:21 +0000 Subject: [PATCH 19/20] Version bump to PQ2A.190205.002 Change-Id: I777d30e644ed2d17d45ccd51f3ac8f779481f7a8 --- 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 a1a64e32e5..4bfb4e940c 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=PQ2A.190205.001 +export BUILD_ID=PQ2A.190205.002 From b36e11d62f1f68732aa9e0d1f0397ad10aba2a6b Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 13 Dec 2018 18:28:31 +0000 Subject: [PATCH 20/20] Version bump to PQ2A.190205.003 Change-Id: I98f389c32af1e680a6652f38a49841aad2c70319 --- 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 4bfb4e940c..93f681257f 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=PQ2A.190205.002 +export BUILD_ID=PQ2A.190205.003