From 88351cd511d3c8a5d17cfbf4e2829e0c19ef4ad2 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 29 Jan 2021 19:50:36 +0000 Subject: [PATCH 001/191] Version bump to SP2A.210129.002 [core/build_id.mk] Change-Id: I4c69d6eac807e3d93e35de0cf04154e3cd7c67b6 --- 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 4d6fd9889e..65a934f43a 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=SP2A.210129.001 +BUILD_ID=SP2A.210129.002 From 3a9a2e3556c589480a42e9c8a51da98dc91f1a26 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Sat, 30 Jan 2021 00:47:28 +0000 Subject: [PATCH 002/191] Version bump to SP2A.210129.003 [core/build_id.mk] Change-Id: I5ca2f1ec38d5bf5269c31c1c304e192b3e1a5f37 --- 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 65a934f43a..5c8b1141c9 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=SP2A.210129.002 +BUILD_ID=SP2A.210129.003 From 371af6df9fbd323b7819e5ca8e02cfd4d4b31f14 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 2 Feb 2021 01:26:07 +0000 Subject: [PATCH 003/191] Version bump to SP2A.210201.002 [core/build_id.mk] Change-Id: I792502cf4aa3b188e31ba4b08436e3c4e9eddf92 --- 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 b88de22a21..8e5f5f946b 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=SP2A.210201.001 +BUILD_ID=SP2A.210201.002 From 6645560ad7ee25f09dd6aff270c3d3c15a20de14 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 2 Feb 2021 02:41:58 +0000 Subject: [PATCH 004/191] Version bump to SP2A.210202.002 [core/build_id.mk] Change-Id: Ie12a5cc854cf75dc46e1780f8d3adad3c67c0dcd --- 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 e809ba70a6..44bbe0e4cc 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=SP2A.210202.001 +BUILD_ID=SP2A.210202.002 From 4f85109c65fb6445292658c7919ea389896a683a Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 2 Feb 2021 22:37:32 +0000 Subject: [PATCH 005/191] Version bump to SP2A.210202.003 [core/build_id.mk] Change-Id: I09b65b329aededb5424d145d9b59e6490f1f5d73 --- 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 44bbe0e4cc..23bdb4ef30 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=SP2A.210202.002 +BUILD_ID=SP2A.210202.003 From 4e84e980a312014a6935203fb45ba7c43449ad3a Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 3 Feb 2021 18:17:32 +0000 Subject: [PATCH 006/191] Version bump to SP2A.210203.002 [core/build_id.mk] Change-Id: I83c6dee731d9176229a20268f2fbcb089f374567 --- 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 5f8d8e55a1..646ea7ea3d 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=SP2A.210203.001 +BUILD_ID=SP2A.210203.002 From 37ffaf8c906d641a99e714882e4eb85178ca7a60 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 5 Feb 2021 01:06:01 +0000 Subject: [PATCH 007/191] Version bump to SP2A.210204.002 [core/build_id.mk] Change-Id: I6c47daf1398edc4a7b6afbf94d7f04f7b40b3b4a --- 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 7423a8a58b..8077b5d56e 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=SP2A.210204.001 +BUILD_ID=SP2A.210204.002 From 02ffe3e8586ca30ea917771465dccf00c524751f Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 5 Feb 2021 07:52:07 +0000 Subject: [PATCH 008/191] Version bump to SP2A.210205.002 [core/build_id.mk] Change-Id: I4fb6dc451367a819399d427b16cd5dd2997347da --- 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 499f55303d..44e71bf86c 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=SP2A.210205.001 +BUILD_ID=SP2A.210205.002 From dd63f4b0b42a36dafd5205ccc0b2c9a2ba5973b7 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 5 Feb 2021 23:15:44 +0000 Subject: [PATCH 009/191] Version bump to SP2A.210205.003 [core/build_id.mk] Change-Id: Id87b9b46e28a0b573633479c9d2846c439adc9a1 --- 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 44e71bf86c..02b5022153 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=SP2A.210205.002 +BUILD_ID=SP2A.210205.003 From 73007e0ebd1f544ef8119d5ec5f2b6622e6026ee Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 8 Feb 2021 19:06:04 +0000 Subject: [PATCH 010/191] Version bump to SP2A.210208.002 [core/build_id.mk] Change-Id: I1ee8cea94ed226c5fe7abeb374b63c249edf5d13 --- 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 b6fbf58f70..351e616fa1 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=SP2A.210208.001 +BUILD_ID=SP2A.210208.002 From 465200bc114cf5c4b6e0162dd9011a55964e832b Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 12 Feb 2021 03:29:50 +0000 Subject: [PATCH 011/191] Version bump to SP2A.210212.002 [core/build_id.mk] Change-Id: I097bccf6dc9a43edd0b402624fc1bc4affb65964 --- 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 adf2b22dfe..556c30fc41 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=SP2A.210212.001 +BUILD_ID=SP2A.210212.002 From 58367c6ee5325c453ea2c74d5d2f8c46c46f8adc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 18 Feb 2021 20:34:08 +0000 Subject: [PATCH 012/191] Version bump to SP2A.210218.002 [core/build_id.mk] Change-Id: I8e2b865ca94b5be11d856a1bc37e738ff96d971f --- 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 b3765a08f6..569f727196 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=SP2A.210218.001 +BUILD_ID=SP2A.210218.002 From 981d3062392db09bfd10098f3d02104eef31c470 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Feb 2021 02:58:20 +0000 Subject: [PATCH 013/191] Version bump to SP2A.210219.002 [core/build_id.mk] Change-Id: I211c4876e09c77a4f348a0fbc3b8a665bfbf98ea --- 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 a3b21b3d4f..9b863ebbde 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=SP2A.210219.001 +BUILD_ID=SP2A.210219.002 From 7993f0a2eb24edd506557428527f3dd4974c0bae Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Feb 2021 12:11:23 +0000 Subject: [PATCH 014/191] Version bump to SP2A.210219.003 [core/build_id.mk] Change-Id: I411b3045d3b91dd46ab50def4f1be72526b7835f --- 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 9b863ebbde..0983b8e02a 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=SP2A.210219.002 +BUILD_ID=SP2A.210219.003 From d4129177605605cf7f223455e90933faf3678944 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Feb 2021 19:39:17 +0000 Subject: [PATCH 015/191] Version bump to SP2A.210219.004 [core/build_id.mk] Change-Id: I28a5c0b5e4aa56f3c85424cbd9d6c4a8c556cc8a --- 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 0983b8e02a..eb0d53fb3f 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=SP2A.210219.003 +BUILD_ID=SP2A.210219.004 From fc47c3160a6eb1f98bb0e552ee2024b15f3c72db Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 23 Feb 2021 17:48:00 +0000 Subject: [PATCH 016/191] Version bump to SP2A.210223.002 [core/build_id.mk] Change-Id: I8a94ec2ed7112ecf6668234a45c35862c5c58507 --- 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 7537134e15..ea0d522e5c 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=SP2A.210223.001 +BUILD_ID=SP2A.210223.002 From c03d1bcbc0f697294126dd92f237576699a21f68 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 24 Feb 2021 00:04:56 +0000 Subject: [PATCH 017/191] Version bump to SP2A.210223.003 [core/build_id.mk] Change-Id: I1f53b1a4713a2917e06e8de49879176d07b0e10b --- 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 ea0d522e5c..04c2455e22 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=SP2A.210223.002 +BUILD_ID=SP2A.210223.003 From 329d1e7f0f725d7500716bdc625f247411196828 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 24 Feb 2021 18:27:49 +0000 Subject: [PATCH 018/191] Version bump to SP2A.210224.002 [core/build_id.mk] Change-Id: Id370fc84538d9e19ab37d623b5af0ad867ed7cde --- 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 d81e541408..b12b14ca04 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=SP2A.210224.001 +BUILD_ID=SP2A.210224.002 From dd3091b467d645e69dfc77b6e8d7de109fb3bd8b Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 26 Feb 2021 23:43:38 +0000 Subject: [PATCH 019/191] Version bump to SP2A.210226.002 [core/build_id.mk] Change-Id: If0cd44142983559c10ac57713cf6d794c58a25ff --- 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 5f662c56d9..fb8fa7a949 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=SP2A.210226.001 +BUILD_ID=SP2A.210226.002 From 43c4ba34c6ee161d036cae8552cc05129f0c7c30 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 1 Mar 2021 18:19:40 +0000 Subject: [PATCH 020/191] Version bump to SP2A.210301.002 [core/build_id.mk] Change-Id: Ibcc1ab7015bf04fc96f77c59f86320a9a0abd3b5 --- 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 609a9aaad2..0f20a91def 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=SP2A.210301.001 +BUILD_ID=SP2A.210301.002 From 8e298bfe2cd9f5a2442f9b21bcbf6f76ea69eb00 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 8 Mar 2021 15:59:34 +0000 Subject: [PATCH 021/191] Version bump to SP2A.210308.002 [core/build_id.mk] Change-Id: Ib945d4838857cc7abe7a8f5a8e76dff196a144be --- 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 7307440a3d..d37950b968 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=SP2A.210308.001 +BUILD_ID=SP2A.210308.002 From 29e222a2ed98bc6cd38aa0d7da4e5db4d029a841 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 9 Mar 2021 22:31:44 +0000 Subject: [PATCH 022/191] Version bump to SP2A.210309.002 [core/build_id.mk] Change-Id: I7e77568743c357d4ede38e0e93144f7d8006015c --- 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 e30070d87a..f4c9d1cdc5 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=SP2A.210309.001 +BUILD_ID=SP2A.210309.002 From 537554ff569b6aab8948851ea887345e0dc40b86 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 15 Mar 2021 19:55:57 +0000 Subject: [PATCH 023/191] Version bump to SP2A.210315.002 [core/build_id.mk] Change-Id: Id260c519f96cf819a45e42ab90baee3f9d2e1fe3 --- 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 df179a1599..1eed20ecae 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=SP2A.210315.001 +BUILD_ID=SP2A.210315.002 From 32b5dfdcfdc42a5270444702da52aa4ccdac8dfb Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 15 Mar 2021 20:37:56 +0000 Subject: [PATCH 024/191] Version bump to SP2A.210315.003 [core/build_id.mk] Change-Id: Id11f9966b3590c1ca04e37f2736cf14860beadac --- 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 1eed20ecae..8470445520 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=SP2A.210315.002 +BUILD_ID=SP2A.210315.003 From a1d3b98b19d571b0e7bd8f748d2171ff9a4f9345 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 16 Mar 2021 01:51:34 +0000 Subject: [PATCH 025/191] Version bump to SP2A.210316.002 [core/build_id.mk] Change-Id: I4033c722ee22a02fd01f8b0f8a6bc7cc9242af97 --- 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 26ce06f9a6..021b120b41 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=SP2A.210316.001 +BUILD_ID=SP2A.210316.002 From 651c3b42a3c4f2a564c8c9997326f339f5ef3ab5 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 17 Mar 2021 16:55:44 +0000 Subject: [PATCH 026/191] Version bump to SP2A.210317.002 [core/build_id.mk] Change-Id: I026ed397d5b1b4fbc6ee648e1f8e6630a3b64e5e --- 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 edade26f9d..a56ad6437b 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=SP2A.210317.001 +BUILD_ID=SP2A.210317.002 From 6752e10b8e16c7a1e238b673d610895588d63669 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 18 Mar 2021 22:38:29 +0000 Subject: [PATCH 027/191] Version bump to SP2A.210318.003 [core/build_id.mk] Change-Id: I90cf59c3f449aa0c84c8d6e557b841a922670222 --- 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 c60191fa23..12626746e7 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=SP2A.210318.002 +BUILD_ID=SP2A.210318.003 From 6847560880ba8aee177a03e6c25bc9cc00035606 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 19 Mar 2021 18:23:21 +0000 Subject: [PATCH 028/191] Version bump to SP2A.210319.002 [core/build_id.mk] Change-Id: Ie921e8d6b4175992b8f6ed802a846b7c833c6e3e --- 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 925c66b092..54d5666770 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=SP2A.210319.001 +BUILD_ID=SP2A.210319.002 From 1dbc46bf70a4aa943bef20282e8da01431b5596a Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 22 Mar 2021 20:11:51 +0000 Subject: [PATCH 029/191] Version bump to SP2A.210322.002 [core/build_id.mk] Change-Id: I3b61c02562fbff87afd737ea96fac93e70b733f1 --- 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 7a180f023b..c7fcc1c582 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=SP2A.210322.001 +BUILD_ID=SP2A.210322.002 From 742f0b7470aa91bd1895b4ffdaa7408f70c25f49 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 22 Mar 2021 22:35:47 +0000 Subject: [PATCH 030/191] Version bump to SP2A.210322.003 [core/build_id.mk] Change-Id: I412055322f0c9a584190c7f4bafaece84700eb25 --- 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 c7fcc1c582..f1d78e3f59 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=SP2A.210322.002 +BUILD_ID=SP2A.210322.003 From 15835f467da758e4f504a074d5ed7ef8b9ab8f11 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 24 Mar 2021 04:57:53 +0000 Subject: [PATCH 031/191] Version bump to SP2A.210324.002 [core/build_id.mk] Change-Id: I7d2a7f1a690ff18c2ccd9f85958323b15e9dc3d6 --- 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 4453b226b1..150441c26e 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=SP2A.210324.001 +BUILD_ID=SP2A.210324.002 From bd6f6cbf6d9ea9242c86798f612e6d1db72e0caf Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 24 Mar 2021 19:32:58 +0000 Subject: [PATCH 032/191] Version bump to SP2A.210324.003 [core/build_id.mk] Change-Id: I53b3991171fffed4913e6e1954e215b61348c9a2 --- 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 150441c26e..4ba1c3bf80 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=SP2A.210324.002 +BUILD_ID=SP2A.210324.003 From 60813c5b5dea11f248c0ecc8823980f145f84bc3 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 30 Mar 2021 04:43:58 +0000 Subject: [PATCH 033/191] Version bump to SP2A.210330.002 [core/build_id.mk] Change-Id: I7c8a36a70e4876ded77c1cec5324cec63c40e922 --- 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 914f4dec00..12410e99e6 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=SP2A.210330.001 +BUILD_ID=SP2A.210330.002 From 5d15e910d1d9e9aab8156bf560f46500f564b130 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 30 Mar 2021 23:39:17 +0000 Subject: [PATCH 034/191] Version bump to SP2A.210330.003 [core/build_id.mk] Change-Id: I13b9ca214b0bddb4bd2eda70e74d16e90eeff698 --- 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 12410e99e6..7d2f95b747 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=SP2A.210330.002 +BUILD_ID=SP2A.210330.003 From ffb57a3010463b89bde78f447c3ea545df7285cc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 31 Mar 2021 06:19:34 +0000 Subject: [PATCH 035/191] Version bump to SP2A.210331.002 [core/build_id.mk] Change-Id: I10e59e7b29f6226c580ed4ef96abb04069592e53 --- 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 5e5bb77d75..6833df48b5 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=SP2A.210331.001 +BUILD_ID=SP2A.210331.002 From dcb979aeb903ca809abd7161c69db82c2330be96 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 1 Apr 2021 00:14:34 +0000 Subject: [PATCH 036/191] Version bump to SP2A.210331.003 [core/build_id.mk] Change-Id: Id03cb2dcb7e4fc90893e5009a1f1904bec3a6d06 --- 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 6833df48b5..e5520bee5a 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=SP2A.210331.002 +BUILD_ID=SP2A.210331.003 From f1a77b212ae373584399e89991c5c6c226791abb Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 1 Apr 2021 01:43:31 +0000 Subject: [PATCH 037/191] Version bump to SP2A.210401.002 [core/build_id.mk] Change-Id: I9f13d07ed39d36f3cdfc0376efc0b6cc66f438bc --- 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 2dd0796539..4fdb561c92 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=SP2A.210401.001 +BUILD_ID=SP2A.210401.002 From 29bb761c1b701a3b4e67901f39fa3322ed70ecdd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 1 Apr 2021 23:01:31 +0000 Subject: [PATCH 038/191] Version bump to SP2A.210401.003 [core/build_id.mk] Change-Id: I022dde9d698bd67e20707527c97952038794f751 --- 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 4fdb561c92..cd5e8c198a 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=SP2A.210401.002 +BUILD_ID=SP2A.210401.003 From 74dae6866803c5e9f96d0fde5ffc2cf8346ae8c9 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 6 Apr 2021 00:07:36 +0000 Subject: [PATCH 039/191] Version bump to SP2A.210405.002 [core/build_id.mk] Change-Id: Ieff1db5144f78f67fa2a23002fad7c0ace2aa53a --- 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 feaca1349f..7d07c828ae 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=SP2A.210405.001 +BUILD_ID=SP2A.210405.002 From 1f8e093e6f212c85c22eb0e08d5167db56f8a49c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 6 Apr 2021 01:59:49 +0000 Subject: [PATCH 040/191] Version bump to SP2A.210406.002 [core/build_id.mk] Change-Id: I6fcdd931fca303bfac815b519465cc0aad01bec6 --- 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 60b3d4028f..7a99edb927 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=SP2A.210406.001 +BUILD_ID=SP2A.210406.002 From 56d5a548d0dea70b31333c20bc5a2342768dea14 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 6 Apr 2021 17:34:01 +0000 Subject: [PATCH 041/191] Version bump to SP2A.210406.003 [core/build_id.mk] Change-Id: I71e1dfd28a16cda47f782a0ae7247a12ec168249 --- 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 7a99edb927..bac872ed15 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=SP2A.210406.002 +BUILD_ID=SP2A.210406.003 From aed0b6a86194047c6d1c1d1c5e6383b857cc01dd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 7 Apr 2021 01:45:37 +0000 Subject: [PATCH 042/191] Version bump to SP2A.210407.002 [core/build_id.mk] Change-Id: Ib642fa4fd37391d130a660d2fac2bfb351469f9a --- 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 8520e341b3..797dbc9a92 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=SP2A.210407.001 +BUILD_ID=SP2A.210407.002 From f307b2171e8cb037950a3f26812fd99060ba7022 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 8 Apr 2021 00:15:42 +0000 Subject: [PATCH 043/191] Version bump to SP2A.210407.003 [core/build_id.mk] Change-Id: I80f318f8b28d1509e9ac85336ccc6a4c2c291825 --- 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 797dbc9a92..af389586ec 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=SP2A.210407.002 +BUILD_ID=SP2A.210407.003 From 8c7bd90934e58cb0c5d3f701c71a2f45dcb35068 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 8 Apr 2021 01:59:59 +0000 Subject: [PATCH 044/191] Version bump to SP2A.210408.002 [core/build_id.mk] Change-Id: I77addbf932ef8d3d9c165c08a2c3b56bc96555eb --- 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 7baa5dec6c..3f8111524f 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=SP2A.210408.001 +BUILD_ID=SP2A.210408.002 From 894c34b48732e45f7fed024fc37dda1a1327c69a Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 8 Apr 2021 16:12:14 +0000 Subject: [PATCH 045/191] Version bump to SP2A.210408.003 [core/build_id.mk] Change-Id: I0e8b5e5ecd89edf0f4dd172f44f14604c8f21184 --- 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 3f8111524f..a6379e1216 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=SP2A.210408.002 +BUILD_ID=SP2A.210408.003 From 8c89fb111a13634ddc28f3cd9b72c2a32ca9f26a Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 8 Apr 2021 22:45:56 +0000 Subject: [PATCH 046/191] Version bump to SP2A.210408.004 [core/build_id.mk] Change-Id: Iba4e798c304214bbab9e3b00e05fa0d263171dbb --- 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 a6379e1216..61157f934b 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=SP2A.210408.003 +BUILD_ID=SP2A.210408.004 From 4c5c8b341b26fb99a5a63eb843f50fb5590b09c5 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 9 Apr 2021 02:19:11 +0000 Subject: [PATCH 047/191] Version bump to SP2A.210409.002 [core/build_id.mk] Change-Id: I7cc38cac3603fe20573a8c3a4ccf23beda1a0889 --- 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 3b283e9abb..202bf460e2 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=SP2A.210409.001 +BUILD_ID=SP2A.210409.002 From d06992dc2f5d52105394765eae156e4cf476f9db Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 9 Apr 2021 17:41:50 +0000 Subject: [PATCH 048/191] Version bump to SP2A.210409.003 [core/build_id.mk] Change-Id: I26a5237f2a1c29dc2215e13e626d2aa90d838151 --- 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 202bf460e2..adc8f6a60c 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=SP2A.210409.002 +BUILD_ID=SP2A.210409.003 From 4b56d26f7a14b9e11007e2d43ae11214901ec5fd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 12 Apr 2021 21:28:32 +0000 Subject: [PATCH 049/191] Version bump to SP2A.210412.002 [core/build_id.mk] Change-Id: I1ad17d149835cbdac42ee2888d0fddb31d273121 --- 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 72b89b5231..07c12dea4a 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=SP2A.210412.001 +BUILD_ID=SP2A.210412.002 From 92e1f6dc22e8c99441df70b40ee18d93acb7f697 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 14 Apr 2021 21:09:37 +0000 Subject: [PATCH 050/191] Version bump to SP2A.210414.002 [core/build_id.mk] Change-Id: I02c671ec889dcbb27feafce3c4e8c12344f9e650 --- 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 db0c56a287..7f86a406bf 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=SP2A.210414.001 +BUILD_ID=SP2A.210414.002 From 7e2361941f3523688edc51313eb679bb4a82a03c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 15 Apr 2021 17:34:00 +0000 Subject: [PATCH 051/191] Version bump to SP2A.210415.002 [core/build_id.mk] Change-Id: I8f5fae67693dd98f847c4e59b253338ad0ea0dbc --- 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 90921e3ff7..60dad976a0 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=SP2A.210415.001 +BUILD_ID=SP2A.210415.002 From f3dc7c754da843cb9ca92190c3cacbf6b247c724 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 15 Apr 2021 17:51:25 +0000 Subject: [PATCH 052/191] Version bump to SP2A.210415.003 [core/build_id.mk] Change-Id: Ie3eaabb5d1868dff0019ea74244abbb391d0cc9d --- 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 60dad976a0..a14fd4eea2 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=SP2A.210415.002 +BUILD_ID=SP2A.210415.003 From 72fdf7cb54557c818e0c05829a08fe78abebb4d8 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 16 Apr 2021 03:15:41 +0000 Subject: [PATCH 053/191] Version bump to SP2A.210416.002 [core/build_id.mk] Change-Id: I2120193c3a2f246ca52c026a8644258b9a1beb34 --- 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 cd66776855..a7e90fa3d1 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=SP2A.210416.001 +BUILD_ID=SP2A.210416.002 From 9119f628ae09846f9e50c863e9b1beb7ea784c93 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 16 Apr 2021 19:29:52 +0000 Subject: [PATCH 054/191] Version bump to SP2A.210416.003 [core/build_id.mk] Change-Id: I96228cdf31898100c284e2759148710972678674 --- 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 a7e90fa3d1..c5367d759a 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=SP2A.210416.002 +BUILD_ID=SP2A.210416.003 From b755c6a074216610ed39bc8130834bc8895c27e0 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 19 Apr 2021 19:03:45 +0000 Subject: [PATCH 055/191] Version bump to SP2A.210419.002 [core/build_id.mk] Change-Id: Iec98960d21f791e8553f09842ed435cdab53aab5 --- 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 05689a4c61..4539c5c44b 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=SP2A.210419.001 +BUILD_ID=SP2A.210419.002 From 428b9e32fb51b845a3f2bdb3beb1b19e8d51edfc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 20 Apr 2021 22:08:00 +0000 Subject: [PATCH 056/191] Version bump to SP2A.210420.002 [core/build_id.mk] Change-Id: I3b828e6bcc830a7f7e1779ead7b266652ed97a47 --- 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 d6d23d2eed..53463b8a3f 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=SP2A.210420.001 +BUILD_ID=SP2A.210420.002 From 22e7a4b5bfa79e5fb5e2a5dc22489cf7da8b91ed Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 21 Apr 2021 18:27:36 +0000 Subject: [PATCH 057/191] Version bump to SP2A.210421.002 [core/build_id.mk] Change-Id: I1dd538efc4b3692db2538f6469950a0e8e4fe250 --- 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 87db8a816d..2966fd78eb 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=SP2A.210421.001 +BUILD_ID=SP2A.210421.002 From c5b64e23225adef26bd18d795ffeb835712e8814 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 22 Apr 2021 17:58:35 +0000 Subject: [PATCH 058/191] Version bump to SP2A.210422.002 [core/build_id.mk] Change-Id: Id6fa3e9b3b3aae1a9b7f34a44ea847f9bacafbf7 --- 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 c177d0b944..4f115856d6 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=SP2A.210422.001 +BUILD_ID=SP2A.210422.002 From 03cc7d70e39cbd35e1a1de3dd129e3ec2b458b2e Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 26 Apr 2021 21:15:50 +0000 Subject: [PATCH 059/191] Version bump to SP2A.210426.002 [core/build_id.mk] Change-Id: I2101579917f2bf8cf77c1937e1db84f6dcd0856e --- 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 82c452de19..2158e7c799 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=SP2A.210426.001 +BUILD_ID=SP2A.210426.002 From 50d56f3341f8befab4bf6742e1edcb4f01d58f4b Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 28 Apr 2021 22:43:24 +0000 Subject: [PATCH 060/191] Version bump to SP2A.210428.002 [core/build_id.mk] Change-Id: I121c797f16e928f2a141eed09b4bd9e9f413f49c --- 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 3420266bd7..542134d3af 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=SP2A.210428.001 +BUILD_ID=SP2A.210428.002 From 8dd8127a5f165c293a873556cdbabbf0bb18c7c4 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 29 Apr 2021 02:49:22 +0000 Subject: [PATCH 061/191] Version bump to SP2A.210429.002 [core/build_id.mk] Change-Id: I105b0cdc73d920b8e1101776660762e9c4545e58 --- 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 1a5bd983d2..fa3219a429 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=SP2A.210429.001 +BUILD_ID=SP2A.210429.002 From 144934c153275dd14383d6537df122ec4ba278ba Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 29 Apr 2021 18:44:02 +0000 Subject: [PATCH 062/191] Version bump to SP2A.210429.003 [core/build_id.mk] Change-Id: Iee52348f8d8d7f1ed91e0484c2c30924c76cd01d --- 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 fa3219a429..c4c53e445a 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=SP2A.210429.002 +BUILD_ID=SP2A.210429.003 From 041e3fc76f6a2fa4757ae0a8546ea984a084ee5b Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 29 Apr 2021 21:47:24 +0000 Subject: [PATCH 063/191] Version bump to SP2A.210429.004 [core/build_id.mk] Change-Id: I0654fca8f92c02c87d39714f958519da1d970a5a --- 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 c4c53e445a..23be864bc8 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=SP2A.210429.003 +BUILD_ID=SP2A.210429.004 From e6d711a219b1add14843e1c9d35c4ae6c3de88ab Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 29 Apr 2021 23:35:41 +0000 Subject: [PATCH 064/191] Version bump to SP2A.210429.005 [core/build_id.mk] Change-Id: I31d90cb680ae18853b5444b8ae1292f2c6c5da91 --- 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 23be864bc8..0cc5c5a67c 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=SP2A.210429.004 +BUILD_ID=SP2A.210429.005 From 372b8b634c58a36d181e4b5302f8baa18a6d6dfc Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 30 Apr 2021 18:31:33 +0000 Subject: [PATCH 065/191] Version bump to SP2A.210430.002 [core/build_id.mk] Change-Id: Ie1be16edb9696e9ede7873d09620d48f1968f43e --- 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 23746bb819..b7e68c31eb 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=SP2A.210430.001 +BUILD_ID=SP2A.210430.002 From 57db31e91691be15e7c6a732ddcb981a887009a3 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 3 May 2021 21:44:56 +0000 Subject: [PATCH 066/191] Version bump to SP2A.210503.002 [core/build_id.mk] Change-Id: I410067add26c4720c02a4035d5564ff55b7c89fb --- 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 5c84dface0..70b07b3513 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=SP2A.210503.001 +BUILD_ID=SP2A.210503.002 From a2827718b3ebf317255ecf45745a7db36886b9ae Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 4 May 2021 02:12:20 +0000 Subject: [PATCH 067/191] Version bump to SP2A.210504.002 [core/build_id.mk] Change-Id: If902c5f8d0320e704685ebcccf3ef0ab2b305446 --- 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 ef8e8367b7..882a9295f3 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=SP2A.210504.001 +BUILD_ID=SP2A.210504.002 From 4e6c9169bed9f8c857019a40ae5c257cf68407ab Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 5 May 2021 20:05:35 +0000 Subject: [PATCH 068/191] Version bump to SP2A.210505.002 [core/build_id.mk] Change-Id: I29f3325847cdaa52348b3ff35a34e5195de1c6b0 --- 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 2abdc8f14b..1ea6665441 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=SP2A.210505.001 +BUILD_ID=SP2A.210505.002 From 38526ca07a29a945614a6221b0dfb11bc2d5c535 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 5 May 2021 21:14:05 +0000 Subject: [PATCH 069/191] Version bump to SP2A.210505.003 [core/build_id.mk] Change-Id: I7bb08c0f98d145160c615f1f7038c0c28b6ba58b --- 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 1ea6665441..12a250b4e1 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=SP2A.210505.002 +BUILD_ID=SP2A.210505.003 From 59d8ccfe24e7b82f2adf4e3975019f2e53cacfbb Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 6 May 2021 01:40:10 +0000 Subject: [PATCH 070/191] Version bump to SP2A.210506.002 [core/build_id.mk] Change-Id: Ifddf805c2e99bfcecfdb683da1e39559bdc07f62 --- 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 840c81d004..26c2f5eb87 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=SP2A.210506.001 +BUILD_ID=SP2A.210506.002 From b1022f8f19487cf5b6f43893caa940bc134a2641 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 6 May 2021 18:20:08 +0000 Subject: [PATCH 071/191] Version bump to SP2A.210506.003 [core/build_id.mk] Change-Id: I21b8d1eda573efe18f5cf38bc1afe6307265e653 --- 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 26c2f5eb87..7edd2b0c81 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=SP2A.210506.002 +BUILD_ID=SP2A.210506.003 From 363d65a0dfd6a68d14f3b75ae51c733e86c6c0ce Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 6 May 2021 23:47:36 +0000 Subject: [PATCH 072/191] Version bump to SP2A.210506.004 [core/build_id.mk] Change-Id: I3581f7d956a690258d954d4ad0f9c71e8874ee55 --- 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 7edd2b0c81..eb816373e0 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=SP2A.210506.003 +BUILD_ID=SP2A.210506.004 From 88a9b0f695d62d83eb4e63e35d5faf4a6bc4a35c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 12 May 2021 22:23:41 +0000 Subject: [PATCH 073/191] Version bump to SP2A.210512.002 [core/build_id.mk] Change-Id: Ibade323811958a423058e27ddae16cce74e6a468 --- 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 e5380c2644..ea4f81413a 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=SP2A.210512.001 +BUILD_ID=SP2A.210512.002 From 646d0ae75b04215898fb653c14358d851b23e2c3 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 13 May 2021 18:04:22 +0000 Subject: [PATCH 074/191] Version bump to SP2A.210513.002 [core/build_id.mk] Change-Id: I76c592b95b5ea908ab810f855ff48f599b732ed6 --- 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 b1e1fd6d8c..9b6c76790b 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=SP2A.210513.001 +BUILD_ID=SP2A.210513.002 From 970614e6e729b5a30c63e2ffc3b0f34182748c99 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 13 May 2021 18:49:38 +0000 Subject: [PATCH 075/191] Version bump to SP2A.210513.003 [core/build_id.mk] Change-Id: I60244157ca096121666d37adccce2e57b2c9f8d9 --- 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 9b6c76790b..b2df5ca07d 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=SP2A.210513.002 +BUILD_ID=SP2A.210513.003 From 31b6ef70ed39f3967d728872306faa92335fc316 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 13 May 2021 20:32:14 +0000 Subject: [PATCH 076/191] Version bump to SP2A.210513.004 [core/build_id.mk] Change-Id: I84530f0cc820c344fa39e544260d3b82394b850c --- 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 b2df5ca07d..5af3844596 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=SP2A.210513.003 +BUILD_ID=SP2A.210513.004 From 8210ce5fadae15f1941cab2cc167447888360b4e Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 17 May 2021 21:17:34 +0000 Subject: [PATCH 077/191] Version bump to SP2A.210517.002 [core/build_id.mk] Change-Id: I207d934d0081ec7274b219539f68af2c61013794 --- 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 1a3256565a..4bee0ab7ce 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=SP2A.210517.001 +BUILD_ID=SP2A.210517.002 From 3a8423c47a658272e1c565158ee5eeb163938813 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 18 May 2021 18:52:36 +0000 Subject: [PATCH 078/191] Version bump to SP2A.210518.002 [core/build_id.mk] Change-Id: I9b449606ddc61a6b3c03d3d24919a96f545c9726 --- 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 257c03dfe6..b4124a3915 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=SP2A.210518.001 +BUILD_ID=SP2A.210518.002 From 16e5c68e66e58c0e318dd635cb9aebbec15fe028 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 19 May 2021 22:27:11 +0000 Subject: [PATCH 079/191] Version bump to SP2A.210519.002 [core/build_id.mk] Change-Id: If83c177ae3fddaacdfa8e502fb43a76fbd379c4f --- 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 eb97117da0..f539d36dde 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=SP2A.210519.001 +BUILD_ID=SP2A.210519.002 From 17109c93d07885cf044665550d2015af009646cb Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 20 May 2021 18:36:25 +0000 Subject: [PATCH 080/191] Version bump to SP2A.210520.002 [core/build_id.mk] Change-Id: Ie1f6c6b4f2363278b496bdf0536c6cf39d540101 --- 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 a7383dc0a0..d33d2ac67a 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=SP2A.210520.001 +BUILD_ID=SP2A.210520.002 From 3151dc4a69cb2bbab505b5f2322e1aa1e240a7c0 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 21 May 2021 20:49:55 +0000 Subject: [PATCH 081/191] Version bump to SP2A.210521.002 [core/build_id.mk] Change-Id: If563a234f9cab4e01456acead7ae78be918a7805 --- 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 436b8fcddc..a8a31cc7c3 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=SP2A.210521.001 +BUILD_ID=SP2A.210521.002 From 6d5366b58e701fa4f7f70fbb6e42a7be7db4f922 Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Tue, 18 May 2021 14:28:03 -0700 Subject: [PATCH 082/191] RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath." This reverts commit efe5ca180cf4e8a5fb81d170e5e4934f03b571b7. Test: m Bug: 184281926 Change-Id: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c Merged-In: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c --- target/product/media_system.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 8160df2957..15a6b598f9 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -58,7 +58,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \ # The values should be of the format : PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ com.android.appsearch:service-appsearch \ - com.android.art:service-art \ com.android.media:service-media-s \ com.android.permission:service-permission \ com.android.geotz:geotz \ From e1fc512bf2d292c25a9859cb2f73b34d66412671 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 27 May 2021 00:30:11 +0000 Subject: [PATCH 083/191] Version bump to SP2A.210526.002 [core/build_id.mk] Change-Id: I6204767373c0725d1b884349e48663a6158cb5d8 --- 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 3eef62b451..36fa372b5d 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=SP2A.210526.001 +BUILD_ID=SP2A.210526.002 From 5e0bf6d81ef5cae64254e2e32c481bcf21f463af Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 27 May 2021 21:15:52 +0000 Subject: [PATCH 084/191] Version bump to SP2A.210527.002 [core/build_id.mk] Change-Id: I0af81a1b081a09446c25f1545c4262a5266eacb2 --- 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 47213b3f2f..5fbea9ed64 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=SP2A.210527.001 +BUILD_ID=SP2A.210527.002 From 9d54e02b3d642e1a2b0cc612787fd8c867151823 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 1 Jun 2021 23:03:57 +0000 Subject: [PATCH 085/191] Version bump to SP2A.210601.002 [core/build_id.mk] Change-Id: I5fe7558291a27763bddb2ec01eccab6139c9f88b --- 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 726149ab34..d3bd940cc1 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=SP2A.210601.001 +BUILD_ID=SP2A.210601.002 From 46766cd1278c3addf5e262a84df621d9c06ef7dd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 2 Jun 2021 03:07:51 +0000 Subject: [PATCH 086/191] Version bump to SP2A.210602.002 [core/build_id.mk] Change-Id: Id0d0281740d8fa06db0745dda21cff293bd3ca77 --- 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 86a62f39ab..7bfdbfa187 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=SP2A.210602.001 +BUILD_ID=SP2A.210602.002 From e52d80bed7f931e4dccc718405cc1f5d392ae226 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 2 Jun 2021 18:53:51 +0000 Subject: [PATCH 087/191] Version bump to SP2A.210602.003 [core/build_id.mk] Change-Id: I1e1de8a614dd7a4b587463e49f8a0aba8d0c56f5 --- 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 7bfdbfa187..ec2a43b331 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=SP2A.210602.002 +BUILD_ID=SP2A.210602.003 From cace713923a527a3d2b3195d93db0fc0683369d9 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 3 Jun 2021 17:34:12 +0000 Subject: [PATCH 088/191] Version bump to SP2A.210603.002 [core/build_id.mk] Change-Id: I87270e3b4202c0ce40dfd43e6168ee5f39b5a8cc --- 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 9442d25f41..9be0b1805e 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=SP2A.210603.001 +BUILD_ID=SP2A.210603.002 From 35fe99eea9e89f8ef4f792a5ac5e36da8d2284a2 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 4 Jun 2021 21:27:49 +0000 Subject: [PATCH 089/191] Version bump to SP2A.210604.002 [core/build_id.mk] Change-Id: Id67c5aad3b2a30d3ad9879e3567960c6bc739cf3 --- 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 9f177819b4..16f683aea6 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=SP2A.210604.001 +BUILD_ID=SP2A.210604.002 From d23725bf22df3f2e2337c0723e0650505ee118d0 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 7 Jun 2021 19:57:49 +0000 Subject: [PATCH 090/191] Version bump to SP2A.210607.002 [core/build_id.mk] Change-Id: I0cf338164c8090e729eb47a409ead6fa3d359405 --- 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 b1e18cc4b3..8397f8d49c 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=SP2A.210607.001 +BUILD_ID=SP2A.210607.002 From fb1ae6bb8e94991b1c14d6d075cc9cb64813f3d0 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 9 Jun 2021 17:13:46 +0000 Subject: [PATCH 091/191] Version bump to SP2A.210609.002 [core/build_id.mk] Change-Id: I267972920c40b809ce2134718a4ed7ebc19cdffd --- 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 2d86b8f15f..5a22df96ba 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=SP2A.210609.001 +BUILD_ID=SP2A.210609.002 From 7c39acc3c3b230225528e8faa49c1070534330ea Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 May 2021 16:31:13 -0700 Subject: [PATCH 092/191] Master is T Bug: 186121492 Test: treehugger Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905 Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905 --- core/version_defaults.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 54d3951ce3..829dea6046 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := SP1A -MIN_PLATFORM_VERSION := SP1A -MAX_PLATFORM_VERSION := SP1A +DEFAULT_PLATFORM_VERSION := TP1A +MIN_PLATFORM_VERSION := TP1A +MAX_PLATFORM_VERSION := TP1A ALLOWED_VERSIONS := $(call allowed-platform-versions,\ $(MIN_PLATFORM_VERSION),\ @@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.SP1A := S +PLATFORM_VERSION_CODENAME.TP1A := T ifndef PLATFORM_VERSION_CODENAME PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) From fd4e64aee7c5405cfb790cf532be5f1c596a00d9 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 16 Jun 2021 00:39:39 +0000 Subject: [PATCH 093/191] Version bump to SP2A.210615.002 [core/build_id.mk] Change-Id: I799ade0a258a76fdb6a5cf02e632bea4038eac7c --- 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 cfcd335c17..ea901730b9 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=SP2A.210615.001 +BUILD_ID=SP2A.210615.002 From 0a30cc41bc8acd25058d9751a75184cb9504b93b Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Tue, 15 Jun 2021 19:35:06 -0700 Subject: [PATCH 094/191] Introduce droidcore-unbundled target The droidcore-unbundled target replaces the droidcore target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This target is similar to droidcore in terms of dependencies, but it has a smaller set of dist files. The intention is to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a VSDK-using vendor build to supply Java dependencies from prebuilts to avoid building (or needing) Java framework sources. Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true Test: m nothing dist (before patch) Test: m nothing dist (after patch) Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch) Test: examine ninja build graph for previous 3 tests Bug: 188176942 Bug: 187064252 Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7 --- core/Makefile | 40 ++++++++--------- core/main.mk | 75 ++++++++++++++++++++++++------- core/tasks/collect_gpl_sources.mk | 2 +- core/tasks/host_init_verifier.mk | 2 +- core/tasks/module-info.mk | 4 +- 5 files changed, 83 insertions(+), 40 deletions(-) diff --git a/core/Makefile b/core/Makefile index d453c36b4b..36ebc58360 100644 --- a/core/Makefile +++ b/core/Makefile @@ -83,7 +83,7 @@ $(pcf_ignored_file): PRIVATE_IGNORED := $(sort $(product_copy_files_ignored)) $(pcf_ignored_file): echo "$(PRIVATE_IGNORED)" | tr " " "\n" >$@ -$(call dist-for-goals,droidcore,$(pcf_ignored_file):logs/$(notdir $(pcf_ignored_file))) +$(call dist-for-goals,droidcore-unbundled,$(pcf_ignored_file):logs/$(notdir $(pcf_ignored_file))) pcf_ignored_file := product_copy_files_ignored := @@ -586,7 +586,7 @@ $(BUILD_SYSTEM_STATS): @rm -f $@ @$(foreach s,$(STATS.MODULE_TYPE),echo "modules_type_make,$(s),$(words $(STATS.MODULE_TYPE.$(s)))" >>$@;) @$(foreach s,$(STATS.SOONG_MODULE_TYPE),echo "modules_type_soong,$(s),$(STATS.SOONG_MODULE_TYPE.$(s))" >>$@;) -$(call dist-for-goals,droidcore,$(BUILD_SYSTEM_STATS)) +$(call dist-for-goals,droidcore-unbundled,$(BUILD_SYSTEM_STATS)) # ----------------------------------------------------------------- # build /product/etc/security/avb/system_other.avbpubkey if needed @@ -611,7 +611,7 @@ SOONG_TO_CONVERT := $(PRODUCT_OUT)/soong_to_convert.txt $(SOONG_TO_CONVERT): $(SOONG_CONV_DATA) $(SOONG_TO_CONVERT_SCRIPT) @rm -f $@ $(hide) $(SOONG_TO_CONVERT_SCRIPT) $< >$@ -$(call dist-for-goals,droidcore,$(SOONG_TO_CONVERT)) +$(call dist-for-goals,droidcore-unbundled,$(SOONG_TO_CONVERT)) MK2BP_CATALOG_SCRIPT := build/make/tools/mk2bp_catalog.py MK2BP_REMAINING_HTML := $(PRODUCT_OUT)/mk2bp_remaining.html @@ -625,7 +625,7 @@ $(MK2BP_REMAINING_HTML): $(SOONG_CONV_DATA) $(MK2BP_CATALOG_SCRIPT) --out_dir="$(OUT_DIR)" \ --mode=html \ > $@ -$(call dist-for-goals,droidcore,$(MK2BP_REMAINING_HTML)) +$(call dist-for-goals,droidcore-unbundled,$(MK2BP_REMAINING_HTML)) MK2BP_REMAINING_CSV := $(PRODUCT_OUT)/mk2bp_remaining.csv $(MK2BP_REMAINING_CSV): $(SOONG_CONV_DATA) $(MK2BP_CATALOG_SCRIPT) @@ -635,7 +635,7 @@ $(MK2BP_REMAINING_CSV): $(SOONG_CONV_DATA) $(MK2BP_CATALOG_SCRIPT) --out_dir="$(OUT_DIR)" \ --mode=csv \ > $@ -$(call dist-for-goals,droidcore,$(MK2BP_REMAINING_CSV)) +$(call dist-for-goals,droidcore-unbundled,$(MK2BP_REMAINING_CSV)) # ----------------------------------------------------------------- # Modules use -Wno-error, or added default -Wall -Werror @@ -647,11 +647,11 @@ $(WALL_WERROR): echo "# Modules added default -Wall" >> $@ for m in $(sort $(SOONG_MODULES_ADDED_WALL) $(MODULES_ADDED_WALL)); do echo $$m >> $@; done -$(call dist-for-goals,droidcore,$(WALL_WERROR)) +$(call dist-for-goals,droidcore-unbundled,$(WALL_WERROR)) # ----------------------------------------------------------------- # C/C++ flag information for modules -$(call dist-for-goals,droidcore,$(SOONG_MODULES_CFLAG_ARTIFACTS)) +$(call dist-for-goals,droidcore-unbundled,$(SOONG_MODULES_CFLAG_ARTIFACTS)) # ----------------------------------------------------------------- # Modules missing profile files @@ -4592,7 +4592,7 @@ endif .PHONY: misc_info misc_info: $(INSTALLED_MISC_INFO_TARGET) -droidcore: $(INSTALLED_MISC_INFO_TARGET) +droidcore-unbundled: $(INSTALLED_MISC_INFO_TARGET) # ----------------------------------------------------------------- # A zip of the directories that map to the target filesystem. @@ -4846,7 +4846,7 @@ endif ifdef BOARD_PREBUILT_BOOTLOADER $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTLOADER_MODULE) -droidcore: $(INSTALLED_BOOTLOADER_MODULE) +droidcore-unbundled: $(INSTALLED_BOOTLOADER_MODULE) endif # Depending on the various images guarantees that the underlying @@ -5434,7 +5434,7 @@ ifeq (true,$(CLANG_COVERAGE)) $(PROFDATA_ZIP): $(SOONG_ZIP) $(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX) - $(call dist-for-goals,droidcore apps_only,$(PROFDATA_ZIP)) + $(call dist-for-goals,droidcore-unbundeld apps_only,$(PROFDATA_ZIP)) endif # ----------------------------------------------------------------- @@ -5613,7 +5613,7 @@ $(INSTALLED_SUPERIMAGE_TARGET): $(INSTALLED_SUPERIMAGE_DEPENDENCIES) $(call build-superimage-target,$(INSTALLED_SUPERIMAGE_TARGET),\ $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt) -droidcore: $(INSTALLED_SUPERIMAGE_TARGET) +droidcore-unbundled: $(INSTALLED_SUPERIMAGE_TARGET) # For devices that uses super image directly, the superimage target points to the file in $(PRODUCT_OUT). .PHONY: superimage @@ -5699,7 +5699,7 @@ $(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_VBMETAIMAGE_TARGET) $(MK_COMBINE_QEMU $(MK_COMBINE_QEMU_IMAGE) -i $(INSTALLED_SYSTEM_QEMU_CONFIG) -o $@) systemimage: $(INSTALLED_QEMU_SYSTEMIMAGE) -droidcore: $(INSTALLED_QEMU_SYSTEMIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_SYSTEMIMAGE) endif ifdef INSTALLED_VENDORIMAGE_TARGET INSTALLED_QEMU_VENDORIMAGE := $(PRODUCT_OUT)/vendor-qemu.img @@ -5708,7 +5708,7 @@ $(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_S (export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) $(INSTALLED_VENDORIMAGE_TARGET)) vendorimage: $(INSTALLED_QEMU_VENDORIMAGE) -droidcore: $(INSTALLED_QEMU_VENDORIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_VENDORIMAGE) endif ifdef INSTALLED_RAMDISK_TARGET @@ -5719,7 +5719,7 @@ $(INSTALLED_QEMU_RAMDISKIMAGE): $(INTERNAL_VENDOR_RAMDISK_TARGET) $(INSTALLED_RA @echo Create ramdisk-qemu.img (cat $(INSTALLED_RAMDISK_TARGET) $(INTERNAL_VENDOR_RAMDISK_TARGET) > $(INSTALLED_QEMU_RAMDISKIMAGE)) -droidcore: $(INSTALLED_QEMU_RAMDISKIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_RAMDISKIMAGE) endif endif endif @@ -5731,7 +5731,7 @@ $(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE (export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) $(INSTALLED_PRODUCTIMAGE_TARGET)) productimage: $(INSTALLED_QEMU_PRODUCTIMAGE) -droidcore: $(INSTALLED_QEMU_PRODUCTIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_PRODUCTIMAGE) endif ifdef INSTALLED_SYSTEM_EXTIMAGE_TARGET INSTALLED_QEMU_SYSTEM_EXTIMAGE := $(PRODUCT_OUT)/system_ext-qemu.img @@ -5740,7 +5740,7 @@ $(INSTALLED_QEMU_SYSTEM_EXTIMAGE): $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) $(MK_QEMU (export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)) systemextimage: $(INSTALLED_QEMU_SYSTEM_EXTIMAGE) -droidcore: $(INSTALLED_QEMU_SYSTEM_EXTIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_SYSTEM_EXTIMAGE) endif ifdef INSTALLED_ODMIMAGE_TARGET INSTALLED_QEMU_ODMIMAGE := $(PRODUCT_OUT)/odm-qemu.img @@ -5749,7 +5749,7 @@ $(INSTALLED_QEMU_ODMIMAGE): $(INSTALLED_ODMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(S (export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) $(INSTALLED_ODMIMAGE_TARGET)) odmimage: $(INSTALLED_QEMU_ODMIMAGE) -droidcore: $(INSTALLED_QEMU_ODMIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_ODMIMAGE) endif ifdef INSTALLED_VENDOR_DLKMIMAGE_TARGET @@ -5759,7 +5759,7 @@ $(INSTALLED_QEMU_VENDOR_DLKMIMAGE): $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) $(MK_QE (export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)) vendor_dlkmimage: $(INSTALLED_QEMU_VENDOR_DLKMIMAGE) -droidcore: $(INSTALLED_QEMU_VENDOR_DLKMIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_VENDOR_DLKMIMAGE) endif ifdef INSTALLED_ODM_DLKMIMAGE_TARGET @@ -5769,7 +5769,7 @@ $(INSTALLED_QEMU_ODM_DLKMIMAGE): $(INSTALLED_ODM_DLKMIMAGE_TARGET) $(MK_QEMU_IMA (export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) $(INSTALLED_ODM_DLKMIMAGE_TARGET)) odm_dlkmimage: $(INSTALLED_QEMU_ODM_DLKMIMAGE) -droidcore: $(INSTALLED_QEMU_ODM_DLKMIMAGE) +droidcore-unbundled: $(INSTALLED_QEMU_ODM_DLKMIMAGE) endif QEMU_VERIFIED_BOOT_PARAMS := $(PRODUCT_OUT)/VerifiedBootParams.textproto @@ -5780,7 +5780,7 @@ $(QEMU_VERIFIED_BOOT_PARAMS): $(INSTALLED_VBMETAIMAGE_TARGET) $(INSTALLED_SYSTEM $(INSTALLED_SYSTEMIMAGE_TARGET) $(QEMU_VERIFIED_BOOT_PARAMS)) systemimage: $(QEMU_VERIFIED_BOOT_PARAMS) -droidcore: $(QEMU_VERIFIED_BOOT_PARAMS) +droidcore-unbundled: $(QEMU_VERIFIED_BOOT_PARAMS) endif # ----------------------------------------------------------------- diff --git a/core/main.mk b/core/main.mk index 52da31ca91..5cee17e291 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1576,9 +1576,10 @@ vbmetasystemimage: $(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET) .PHONY: vbmetavendorimage vbmetavendorimage: $(INSTALLED_VBMETA_VENDORIMAGE_TARGET) -# Build files and then package it into the rom formats -.PHONY: droidcore -droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ +# The droidcore-unbundled target depends on the subset of targets necessary to +# perform a full system build (either unbundled or not). +.PHONY: droidcore-unbundled +droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ $(INSTALLED_SYSTEMIMAGE_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \ @@ -1636,6 +1637,11 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ soong_docs +# The droidcore target depends on the droidcore-unbundled subset and any other +# targets for a non-unbundled (full source) full system build. +.PHONY: droidcore +droidcore: droidcore-unbundled + # dist_files only for putting your library into the dist directory with a full build. .PHONY: dist_files @@ -1711,21 +1717,43 @@ $(eval $(call combine-notice-files, html, \ $(apps_only_installed_files))) -else ifeq (,$(TARGET_BUILD_UNBUNDLED)) +else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) + + # Truth table for entering this block of code: + # TARGET_BUILD_UNBUNDLED | TARGET_BUILD_UNBUNDLED_IMAGE | Action + # -----------------------|------------------------------|------------------------- + # not set | not set | droidcore path + # not set | true | invalid + # true | not set | skip + # true | true | droidcore-unbundled path + + # We dist the following targets only for droidcore full build. These items + # can include java-related targets that would cause building framework java + # sources in a droidcore full build. + $(call dist-for-goals, droidcore, \ + $(BUILT_OTATOOLS_PACKAGE) \ + $(APPCOMPAT_ZIP) \ + $(DEXPREOPT_CONFIG_ZIP) \ + $(DEXPREOPT_TOOLS_ZIP) \ + ) + + # We dist the following targets for droidcore-unbundled (and droidcore since + # droidcore depends on droidcore-unbundled). The droidcore-unbundled target + # is a subset of droidcore. It can be used used for an unbundled build to + # avoid disting targets that would cause building framework java sources, + # which we want to avoid in an unbundled build. + + $(call dist-for-goals, droidcore-unbundled, \ $(INTERNAL_UPDATE_PACKAGE_TARGET) \ $(INTERNAL_OTA_PACKAGE_TARGET) \ $(INTERNAL_OTA_METADATA) \ $(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET) \ $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \ - $(BUILT_OTATOOLS_PACKAGE) \ $(SYMBOLS_ZIP) \ $(PROGUARD_DICT_ZIP) \ $(PROGUARD_USAGE_ZIP) \ $(COVERAGE_ZIP) \ - $(APPCOMPAT_ZIP) \ - $(DEXPREOPT_CONFIG_ZIP) \ - $(DEXPREOPT_TOOLS_ZIP) \ $(INSTALLED_FILES_FILE) \ $(INSTALLED_FILES_JSON) \ $(INSTALLED_FILES_FILE_VENDOR) \ @@ -1754,11 +1782,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_MISC_INFO_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ - ) + ) # Put a copy of the radio/bootloader files in the dist dir. $(foreach f,$(INSTALLED_RADIOIMAGE_TARGET), \ - $(call dist-for-goals, droidcore, $(f))) + $(call dist-for-goals, droidcore-unbundled, $(f))) ifneq ($(ANDROID_BUILD_EMBEDDED),true) $(call dist-for-goals, droidcore, \ @@ -1767,13 +1795,13 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) ) endif - $(call dist-for-goals, droidcore, \ + $(call dist-for-goals, droidcore-unbundled, \ $(INSTALLED_FILES_FILE_ROOT) \ $(INSTALLED_FILES_JSON_ROOT) \ ) ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) - $(call dist-for-goals, droidcore, \ + $(call dist-for-goals, droidcore-unbundled, \ $(INSTALLED_FILES_FILE_RAMDISK) \ $(INSTALLED_FILES_JSON_RAMDISK) \ $(INSTALLED_FILES_FILE_DEBUG_RAMDISK) \ @@ -1793,7 +1821,7 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) endif ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) - $(call dist-for-goals, droidcore, \ + $(call dist-for-goals, droidcore-unbundled, \ $(recovery_ramdisk) \ ) endif @@ -1823,10 +1851,25 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) $(call dist-for-goals,droidcore,$(f):ndk_apis/$(notdir $(f)))) endif -# Building a full system-- the default is to build droidcore -droid_targets: droidcore dist_files + # For full system build (whether unbundled or not), we configure + # droid_targets to depend on droidcore-unbundled, which will set up the full + # system dependencies and also dist the subset of targets that correspond to + # an unbundled build (exclude building some framework sources). -endif # !TARGET_BUILD_UNBUNDLED + droid_targets: droidcore-unbundled + + ifeq (,$(TARGET_BUILD_UNBUNDLED_IMAGE)) + + # If we're building a full system (including the framework sources excluded + # by droidcore-unbundled), we configure droid_targets also to depend on + # droidcore, which includes all dist for droidcore, and will build the + # necessary framework sources. + + droid_targets: droidcore dist_files + + endif + +endif # TARGET_BUILD_UNBUNDLED == TARGET_BUILD_UNBUNDLED_IMAGE .PHONY: docs docs: $(ALL_DOCS) diff --git a/core/tasks/collect_gpl_sources.mk b/core/tasks/collect_gpl_sources.mk index ebc41814f7..9e9ab8ecc2 100644 --- a/core/tasks/collect_gpl_sources.mk +++ b/core/tasks/collect_gpl_sources.mk @@ -26,4 +26,4 @@ $(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES) $(hide) tar cfz $@ --exclude ".git*" $(PRIVATE_PATHS) # Dist the tgz only if we are doing a full build -$(call dist-for-goals,droidcore,$(gpl_source_tgz)) +$(call dist-for-goals,droidcore-unbundled,$(gpl_source_tgz)) diff --git a/core/tasks/host_init_verifier.mk b/core/tasks/host_init_verifier.mk index bdf996ce68..e4637107e9 100644 --- a/core/tasks/host_init_verifier.mk +++ b/core/tasks/host_init_verifier.mk @@ -53,4 +53,4 @@ $(host_init_verifier_output): $(HOST_INIT_VERIFIER) --out_product $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT) \ > $@ -$(call dist-for-goals,droidcore,$(host_init_verifier_output)) +$(call dist-for-goals,droidcore-unbundled,$(host_init_verifier_output)) diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index c866259ee8..c8382643d5 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -26,7 +26,7 @@ $(MODULE_INFO_JSON): $(hide) echo '}' >> $@ -droidcore: $(MODULE_INFO_JSON) +droidcore-unbundled: $(MODULE_INFO_JSON) $(call dist-for-goals, general-tests, $(MODULE_INFO_JSON)) -$(call dist-for-goals, droidcore, $(MODULE_INFO_JSON)) +$(call dist-for-goals, droidcore-unbundled, $(MODULE_INFO_JSON)) From 49cc59ce4b239d3db15b71a1c11e939d044e6104 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 16 Jun 2021 03:19:50 +0000 Subject: [PATCH 095/191] Version bump to SP2A.210616.002 [core/build_id.mk] Change-Id: I83e4970179a8357c46de743ca778ec7f32680c42 --- 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 cb01d56e8f..81503bbd95 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=SP2A.210616.001 +BUILD_ID=SP2A.210616.002 From d772582506e763b0cdc15a01ab3a7d9c6fbf051e Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 16 Jun 2021 18:03:35 +0000 Subject: [PATCH 096/191] Version bump to SP2A.210616.003 [core/build_id.mk] Change-Id: I77b413c26c29fa9bfcaf59598eebd3eaee0262b8 --- 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 81503bbd95..ee735763e4 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=SP2A.210616.002 +BUILD_ID=SP2A.210616.003 From 4a3069b161b570ea388f73d92167bad88c92bf40 Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Wed, 16 Jun 2021 14:57:36 -0700 Subject: [PATCH 097/191] Fix typo in droidcore-unbundled. Test: manual inspection. Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 36ebc58360..b9ca463cf7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5434,7 +5434,7 @@ ifeq (true,$(CLANG_COVERAGE)) $(PROFDATA_ZIP): $(SOONG_ZIP) $(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX) - $(call dist-for-goals,droidcore-unbundeld apps_only,$(PROFDATA_ZIP)) + $(call dist-for-goals,droidcore-unbundled apps_only,$(PROFDATA_ZIP)) endif # ----------------------------------------------------------------- From 259bc0bfa1c721b45040cba651d8b66351c88186 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 17 Jun 2021 14:59:38 +0000 Subject: [PATCH 098/191] Version bump to SP2A.210617.002 [core/build_id.mk] Change-Id: I5d9a9853477cbfa0b11ce3000236bf2021d5681a --- 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 5e6e0959ad..93d3242105 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=SP2A.210617.001 +BUILD_ID=SP2A.210617.002 From eee4bddad6c7e19eda317dc144630914dce5e667 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 18 Jun 2021 16:57:25 +0000 Subject: [PATCH 099/191] Version bump to SP2A.210618.002 [core/build_id.mk] Change-Id: I1850b087466a108be93d77453071d717bd25715f --- 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 f6c3b8e521..dcecf86a56 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=SP2A.210618.001 +BUILD_ID=SP2A.210618.002 From a49c42e1f1b0fe765ab26ce07d026e6959f87201 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 22 Jun 2021 15:57:47 +0000 Subject: [PATCH 100/191] Version bump to SP2A.210622.002 [core/build_id.mk] Change-Id: I11d52f0fec1186d22b564af0743c22c7996205d8 --- 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 1e17ded3b9..50622a9893 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=SP2A.210622.001 +BUILD_ID=SP2A.210622.002 From 532284d92aca5be2df1fe3890f7f9a6267a375cd Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 24 Jun 2021 23:51:41 +0000 Subject: [PATCH 101/191] Version bump to SP2A.210624.002 [core/build_id.mk] Change-Id: I8f99cf90cb661c99407b44629b17b1e93683e98d --- 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 6e87720e5b..3202836fa6 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=SP2A.210624.001 +BUILD_ID=SP2A.210624.002 From 50005b411ddc00cd844d0fbd65bb3c5a1ea9d2ff Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 28 Jun 2021 14:59:43 +0000 Subject: [PATCH 102/191] Version bump to SP2A.210628.002 [core/build_id.mk] Change-Id: I31260d76e5e3beee23713b1439c7e55d92245160 --- 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 67968bc417..40ca98c3ab 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=SP2A.210628.001 +BUILD_ID=SP2A.210628.002 From 678396c2ef595453fbfeef731db18425904ef77e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 30 Jun 2021 16:09:33 +0000 Subject: [PATCH 103/191] Version bump to SP2A.210630.002 [core/build_id.mk] Change-Id: I35014b5354a47cb4e325c06f5d4392c9f30bc82a --- 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 729431f99a..e4511b64e5 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=SP2A.210630.001 +BUILD_ID=SP2A.210630.002 From 68bd2bac16332c4b880ca43bffe2c4cbfb0fa42c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 30 Jun 2021 22:37:53 +0000 Subject: [PATCH 104/191] Version bump to SP2A.210630.003 [core/build_id.mk] Change-Id: I88ffacc06638f20456ef13c29adbe255bb19131f --- 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 e4511b64e5..2c61653147 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=SP2A.210630.002 +BUILD_ID=SP2A.210630.003 From 5dd384e874895a5b8dab5f5ee3593de6beda59d0 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 1 Jul 2021 17:41:55 +0000 Subject: [PATCH 105/191] Version bump to SP2A.210701.002 [core/build_id.mk] Change-Id: I466aa788e6c5e434ea514512f57316dac699db7d --- 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 248199deba..4ae365d257 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=SP2A.210701.001 +BUILD_ID=SP2A.210701.002 From b09f028e66d0502c3cd51aa4adc2898d3099b4cd Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 8 Jul 2021 21:12:32 +0000 Subject: [PATCH 106/191] Version bump to SP2A.210708.002 [core/build_id.mk] Change-Id: Ia7edb2a157cd8d28201016a8b28c5fa31d83035b --- 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 279222011a..ae48e4f4e9 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=SP2A.210708.001 +BUILD_ID=SP2A.210708.002 From 6537088637292e809f2b93da615a3eaefb7f6502 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 12 Jul 2021 17:39:52 +0000 Subject: [PATCH 107/191] Version bump to SP2A.210712.002 [core/build_id.mk] Change-Id: Ie4ab050a1c171f9f0bd315c14d169bf2c13fde9b --- 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 311b4c7018..59c8818666 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=SP2A.210712.001 +BUILD_ID=SP2A.210712.002 From 90957a21ae612eff38448efa40bac58d2ef473a3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 15 Jul 2021 21:34:21 +0000 Subject: [PATCH 108/191] Version bump to SP2A.210715.002 [core/build_id.mk] Change-Id: Ic0c94ae77d2d558852cddbc4e9c3a7e44405ff8e --- 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 e109595757..b3f69c95cc 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=SP2A.210715.001 +BUILD_ID=SP2A.210715.002 From 1de66c6746e0b5d7e9c014ed4c12621bad30cd53 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 19 Jul 2021 18:02:02 +0000 Subject: [PATCH 109/191] Version bump to SP2A.210719.002 [core/build_id.mk] Change-Id: I9849844df9404278d9406a00675fe95e4de5554e --- 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 1bb58b04dd..aacfd67c0a 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=SP2A.210719.001 +BUILD_ID=SP2A.210719.002 From 1ab243f9569198a7cb69ee80c630f34f907b792d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 20 Jul 2021 01:57:44 +0000 Subject: [PATCH 110/191] Version bump to SP2A.210720.002 [core/build_id.mk] Change-Id: I4f42ad0b30fbc1d3c0fa1510b7828151457b23a3 --- 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 087710d815..06b0fb7104 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=SP2A.210720.001 +BUILD_ID=SP2A.210720.002 From e7f2588ea1e24f59eb9d4f4fc2c310b426d86935 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 23 Jul 2021 17:57:44 +0000 Subject: [PATCH 111/191] Version bump to SP2A.210723.002 [core/build_id.mk] Change-Id: I7db5fd2430c1ef3b1c4006d0171e373cee7dfdf2 --- 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 117c5f6331..72265c28a9 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=SP2A.210723.001 +BUILD_ID=SP2A.210723.002 From 01a5400d5e34133a4019cd7b176839638bd910c8 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 29 Jul 2021 18:28:07 +0000 Subject: [PATCH 112/191] Version bump to SP2A.210729.002 [core/build_id.mk] Change-Id: I40a58dc1c649aaacac659ac3b4bf3fe86b08765c --- 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 0b9b322057..ad0f3126a5 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=SP2A.210729.001 +BUILD_ID=SP2A.210729.002 From 74106be1d073843978022c33205838e050d89d23 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 29 Jul 2021 23:05:31 +0000 Subject: [PATCH 113/191] Version bump to SP2A.210729.003 [core/build_id.mk] Change-Id: Ic3f4153c28653617bdb3cbcecc84fb3495285e59 --- 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 ad0f3126a5..c919d0ab62 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=SP2A.210729.002 +BUILD_ID=SP2A.210729.003 From 2a69b486cfa00abbcc4ff33bbd03dcbe6b1d19eb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 Aug 2021 11:18:57 -0700 Subject: [PATCH 114/191] Update codename for sc-v2-dev to Sv2 Bug: 193674948 Test: treehugger Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905 Change-Id: I0e7af15f58a2859ca938d01cff067700a85b7743 --- core/version_defaults.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 31c30b6719..347f29f9b2 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := SP1A -MIN_PLATFORM_VERSION := SP1A -MAX_PLATFORM_VERSION := SP1A +DEFAULT_PLATFORM_VERSION := SP2A +MIN_PLATFORM_VERSION := SP2A +MAX_PLATFORM_VERSION := SP2A ALLOWED_VERSIONS := $(call allowed-platform-versions,\ $(MIN_PLATFORM_VERSION),\ @@ -94,6 +94,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". PLATFORM_VERSION_CODENAME.SP1A := S +PLATFORM_VERSION_CODENAME.SP2A := Sv2 ifndef PLATFORM_VERSION_CODENAME PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) From ca3dc5678f4961acfbe8cbcf778473e79e381075 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 Aug 2021 11:18:57 -0700 Subject: [PATCH 115/191] Update codename for sc-v2-dev to Sv2 Bug: 193674948 Test: treehugger Change-Id: I0e7af15f58a2859ca938d01cff067700a85b7743 --- core/version_defaults.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 973b3b88ed..d7e83d0914 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -93,6 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". +PLATFORM_VERSION_CODENAME.SP2A := Sv2 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu ifndef PLATFORM_VERSION_CODENAME From b3c7b25df49c4dd7ded66840bececcc00bba54d8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 4 Aug 2021 16:54:03 -0700 Subject: [PATCH 116/191] Remove S codename from sc-v2-dev S was finalized, it shouldn't be listed as an active codename any more. Bug: 193674948 Test: treehugger Change-Id: I4cce94b0ea4865a5248ab106edce8fa165390005 Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905 --- core/version_defaults.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 347f29f9b2..cd4947d5eb 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -93,7 +93,6 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.SP1A := S PLATFORM_VERSION_CODENAME.SP2A := Sv2 ifndef PLATFORM_VERSION_CODENAME From 4e076edf51b6cc4fe13958a33a8195ce41cc3737 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 5 Aug 2021 01:39:44 +0000 Subject: [PATCH 117/191] Version bump to SP2A.210805.002 [core/build_id.mk] Change-Id: I60c2a4c1affbd54a3ca078c832e86c0d86ceef04 --- 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 f9278c326e..f554ab17f5 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=SP2A.210805.001 +BUILD_ID=SP2A.210805.002 From 876a3c8934dc60cb98b5424d0c710d1d8191a6b2 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Mon, 16 Aug 2021 21:30:54 +0800 Subject: [PATCH 118/191] Roll-forward the VNDK snapshot list of GSI The latest stable SDK version is 31, so add 31 to the list of VNDK snapshots. Bug: 196806844 Bug: 198554350 Test: Presubmit Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 --- target/product/gsi_release.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index d924d0bc11..93b8c66f3c 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -62,8 +62,12 @@ PRODUCT_PACKAGES += \ init.gsi.rc \ init.vndk-nodef.rc \ -# Support additional P, Q and R VNDK packages -PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30 +# Support additional VNDK snapshots +PRODUCT_EXTRA_VNDK_VERSIONS := \ + 28 \ + 29 \ + 30 \ + 31 \ # Do not build non-GSI partition images. PRODUCT_BUILD_CACHE_IMAGE := false From 9a9da6024c0d97bd3ad1cd647043afe344862173 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 13 Sep 2021 15:50:20 -0700 Subject: [PATCH 119/191] Move the stable code from version_defaults.mk to version_util.mk. With version_defaults.mk containing only simple assignments, it can be automatically converted to Starlark. This is a cherrypick of ag/15768054 Bug: 198995713 Test: treehugger Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202 Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202 --- core/version_defaults.mk | 235 ++----------------------------------- core/version_util.mk | 245 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 228 deletions(-) create mode 100644 core/version_util.mk diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d7fcb288fc..dcd0d1d435 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -40,51 +40,10 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE endif DEFAULT_PLATFORM_VERSION := TP1A +.KATI_READONLY := DEFAULT_PLATFORM_VERSION MIN_PLATFORM_VERSION := TP1A MAX_PLATFORM_VERSION := TP1A -ALLOWED_VERSIONS := $(call allowed-platform-versions,\ - $(MIN_PLATFORM_VERSION),\ - $(MAX_PLATFORM_VERSION),\ - $(DEFAULT_PLATFORM_VERSION)) - -ifndef TARGET_PLATFORM_VERSION - TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION) -endif - -ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION))) - $(warning Invalid TARGET_PLATFORM_VERSION '$(TARGET_PLATFORM_VERSION)', must be one of) - $(error $(ALLOWED_VERSIONS)) -endif -ALLOWED_VERSIONS := -MIN_PLATFORM_VERSION := -MAX_PLATFORM_VERSION := - -.KATI_READONLY := \ - DEFAULT_PLATFORM_VERSION \ - TARGET_PLATFORM_VERSION - -# Default versions for each TARGET_PLATFORM_VERSION -# TODO: PLATFORM_VERSION, PLATFORM_SDK_VERSION, etc. should be conditional -# on this - -# This is the canonical definition of the platform version, -# which is the version that we reveal to the end user. -# Update this value when the platform version changes (rather -# than overriding it somewhere else). Can be an arbitrary string. - -# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION -# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's -# in the following text file: -# cts/tests/tests/os/assets/platform_versions.txt - -# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME -# entry for each unreleased API level, regardless of -# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to -# generate the range of allowed SDK versions, so it must have an entry for every -# unreleased API level targetable by this branch, not just those that are valid -# lunch targets for this branch. - # The last stable version name of the platform that was released. During # development, this stays at that previous version, while the codename indicates # further work based on the previous version. @@ -96,49 +55,6 @@ PLATFORM_VERSION_LAST_STABLE := 12 PLATFORM_VERSION_CODENAME.SP2A := Sv2 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu -ifndef PLATFORM_VERSION_CODENAME - PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) - ifndef PLATFORM_VERSION_CODENAME - # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION - PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION) - endif - - # This is all of the *active* development codenames. - # This confusing name is needed because - # all_codenames has been baked into build.prop for ages. - # - # Should be either the same as PLATFORM_VERSION_CODENAME or a comma-separated - # list of additional codenames after PLATFORM_VERSION_CODENAME. - PLATFORM_VERSION_ALL_CODENAMES := - - # Build a list of all active code names. Avoid duplicates, and stop when we - # reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond - # that is not included in our build). - _versions_in_target := \ - $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION)) - $(foreach version,$(_versions_in_target),\ - $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\ - $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\ - $(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename)))) - - # And convert from space separated to comma separated. - PLATFORM_VERSION_ALL_CODENAMES := \ - $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES))) - -endif -.KATI_READONLY := \ - PLATFORM_VERSION_CODENAME \ - PLATFORM_VERSION_ALL_CODENAMES - -ifndef PLATFORM_VERSION - ifeq (REL,$(PLATFORM_VERSION_CODENAME)) - PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE) - else - PLATFORM_VERSION := $(PLATFORM_VERSION_CODENAME) - endif -endif -.KATI_READONLY := PLATFORM_VERSION - ifndef PLATFORM_SDK_VERSION # This is the canonical definition of the SDK version, which defines # the set of APIs and functionality available in the platform. It @@ -157,89 +73,12 @@ endif .KATI_READONLY := PLATFORM_SDK_VERSION # This is the sdk extension version of this tree. -PLATFORM_SDK_EXTENSION_VERSION :=$= 1 +PLATFORM_SDK_EXTENSION_VERSION := 1 +.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION # This is the sdk extension version that PLATFORM_SDK_VERSION ships with. -PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0 - -ifeq (REL,$(PLATFORM_VERSION_CODENAME)) - PLATFORM_PREVIEW_SDK_VERSION := 0 -else - ifndef PLATFORM_PREVIEW_SDK_VERSION - # This is the definition of a preview SDK version over and above the current - # platform SDK version. Unlike the platform SDK version, a higher value - # for preview SDK version does NOT mean that all prior preview APIs are - # included. Packages reading this value to determine compatibility with - # known APIs should check that this value is precisely equal to the preview - # SDK version the package was built for, otherwise it should fall back to - # assuming the device can only support APIs as of the previous official - # public release. - # This value will always be forced to 0 for release builds by the logic - # in the "ifeq" block above, so the value below will be used on any - # non-release builds, and it should always be at least 1, to indicate that - # APIs may have changed since the claimed PLATFORM_SDK_VERSION. - PLATFORM_PREVIEW_SDK_VERSION := 1 - endif -endif -.KATI_READONLY := PLATFORM_PREVIEW_SDK_VERSION - -ifndef DEFAULT_APP_TARGET_SDK - # This is the default minSdkVersion and targetSdkVersion to use for - # all .apks created by the build system. It can be overridden by explicitly - # setting these in the .apk's AndroidManifest.xml. It is either the code - # name of the development build or, if this is a release build, the official - # SDK version of this release. - ifeq (REL,$(PLATFORM_VERSION_CODENAME)) - DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION) - else - DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME) - endif -endif -.KATI_READONLY := DEFAULT_APP_TARGET_SDK - -ifndef PLATFORM_VNDK_VERSION - # This is the definition of the VNDK version for the current VNDK libraries. - # The version is only available when PLATFORM_VERSION_CODENAME == REL. - # Otherwise, it will be set to a CODENAME version. The ABI is allowed to be - # changed only before the Android version is released. Once - # PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version - # will be frozon and emit build errors if any ABI for the VNDK libs are - # changed. - # After that the snapshot of the VNDK with this version will be generated. - # - # The VNDK version follows PLATFORM_SDK_VERSION. - ifeq (REL,$(PLATFORM_VERSION_CODENAME)) - PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION) - else - PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME) - endif -endif -.KATI_READONLY := PLATFORM_VNDK_VERSION - -ifndef PLATFORM_SYSTEMSDK_MIN_VERSION - # This is the oldest version of system SDK that the platform supports. Contrary - # to the public SDK where platform essentially supports all previous SDK versions, - # platform supports only a few number of recent system SDK versions as some of - # old system APIs are gradually deprecated, removed and then deleted. - PLATFORM_SYSTEMSDK_MIN_VERSION := 28 -endif -.KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION - -# This is the list of system SDK versions that the current platform supports. -PLATFORM_SYSTEMSDK_VERSIONS := -ifneq (,$(PLATFORM_SYSTEMSDK_MIN_VERSION)) - $(if $(call math_is_number,$(PLATFORM_SYSTEMSDK_MIN_VERSION)),,\ - $(error PLATFORM_SYSTEMSDK_MIN_VERSION must be a number, but was $(PLATFORM_SYSTEMSDK_MIN_VERSION))) - PLATFORM_SYSTEMSDK_VERSIONS := $(call int_range_list,$(PLATFORM_SYSTEMSDK_MIN_VERSION),$(PLATFORM_SDK_VERSION)) -endif -# Platform always supports the current version -ifeq (REL,$(PLATFORM_VERSION_CODENAME)) - PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION) -else - PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES)) -endif -PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS))) -.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS +PLATFORM_BASE_SDK_EXTENSION_VERSION := 0 +.KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION ifndef PLATFORM_SECURITY_PATCH # Used to indicate the security patch that has been applied to the device. @@ -247,69 +86,9 @@ 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-10-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH -ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP - # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH. - PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s) -endif -.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP +include $(BUILD_SYSTEM)/version_util.mk -ifndef PLATFORM_BASE_OS - # Used to indicate the base os applied to the device. - # Can be an arbitrary string, but must be a single word. - # - # If there is no $PLATFORM_BASE_OS set, keep it empty. - PLATFORM_BASE_OS := -endif -.KATI_READONLY := PLATFORM_BASE_OS - -ifndef BUILD_ID - # Used to signify special builds. E.g., branches and/or releases, - # like "M5-RC7". Can be an arbitrary string, but must be a single - # word and a valid file name. - # - # If there is no BUILD_ID set, make it obvious. - BUILD_ID := UNKNOWN -endif -.KATI_READONLY := BUILD_ID - -ifndef BUILD_DATETIME - # Used to reproduce builds by setting the same time. Must be the number - # of seconds since the Epoch. - BUILD_DATETIME := $(shell date +%s) -endif - -DATE := date -d @$(BUILD_DATETIME) -.KATI_READONLY := DATE - -# Everything should be using BUILD_DATETIME_FROM_FILE instead. -# BUILD_DATETIME and DATE can be removed once BUILD_NUMBER moves -# to soong_ui. -$(KATI_obsolete_var BUILD_DATETIME,Use BUILD_DATETIME_FROM_FILE) - -HAS_BUILD_NUMBER := true -ifndef BUILD_NUMBER - # BUILD_NUMBER should be set to the source control value that - # represents the current state of the source code. E.g., a - # perforce changelist number or a git hash. Can be an arbitrary string - # (to allow for source control that uses something other than numbers), - # but must be a single word and a valid file name. - # - # If no BUILD_NUMBER is set, create a useful "I am an engineering build - # from this date/time" value. Make it start with a non-digit so that - # anyone trying to parse it as an integer will probably get "0". - BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) - HAS_BUILD_NUMBER := false -endif -.KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER - -ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION - # Used to set minimum supported target sdk version. Apps targeting sdk - # version lower than the set value will result in a warning being shown - # when any activity from the app is started. - PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23 -endif -.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION diff --git a/core/version_util.mk b/core/version_util.mk new file mode 100644 index 0000000000..b7c4e48641 --- /dev/null +++ b/core/version_util.mk @@ -0,0 +1,245 @@ +# +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# + +ALLOWED_VERSIONS := $(call allowed-platform-versions,\ + $(MIN_PLATFORM_VERSION),\ + $(MAX_PLATFORM_VERSION),\ + $(DEFAULT_PLATFORM_VERSION)) + +ifndef TARGET_PLATFORM_VERSION + TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION) +endif + +ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION))) + $(warning Invalid TARGET_PLATFORM_VERSION '$(TARGET_PLATFORM_VERSION)', must be one of) + $(error $(ALLOWED_VERSIONS)) +endif +ALLOWED_VERSIONS := +MIN_PLATFORM_VERSION := +MAX_PLATFORM_VERSION := + +.KATI_READONLY := TARGET_PLATFORM_VERSION + +# Default versions for each TARGET_PLATFORM_VERSION +# TODO: PLATFORM_VERSION, PLATFORM_SDK_VERSION, etc. should be conditional +# on this + +# This is the canonical definition of the platform version, +# which is the version that we reveal to the end user. +# Update this value when the platform version changes (rather +# than overriding it somewhere else). Can be an arbitrary string. + +# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION +# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's +# in the following text file: +# cts/tests/tests/os/assets/platform_versions.txt + +# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME +# entry for each unreleased API level, regardless of +# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to +# generate the range of allowed SDK versions, so it must have an entry for every +# unreleased API level targetable by this branch, not just those that are valid +# lunch targets for this branch. + +ifndef PLATFORM_VERSION_CODENAME + PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) + ifndef PLATFORM_VERSION_CODENAME + # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION + PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION) + endif + + # This is all of the *active* development codenames. + # This confusing name is needed because + # all_codenames has been baked into build.prop for ages. + # + # Should be either the same as PLATFORM_VERSION_CODENAME or a comma-separated + # list of additional codenames after PLATFORM_VERSION_CODENAME. + PLATFORM_VERSION_ALL_CODENAMES := + + # Build a list of all active code names. Avoid duplicates, and stop when we + # reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond + # that is not included in our build). + _versions_in_target := \ + $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION)) + $(foreach version,$(_versions_in_target),\ + $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\ + $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\ + $(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename)))) + + # And convert from space separated to comma separated. + PLATFORM_VERSION_ALL_CODENAMES := \ + $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES))) + +endif +.KATI_READONLY := \ + PLATFORM_VERSION_CODENAME \ + PLATFORM_VERSION_ALL_CODENAMES + +ifndef PLATFORM_VERSION + ifeq (REL,$(PLATFORM_VERSION_CODENAME)) + PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE) + else + PLATFORM_VERSION := $(PLATFORM_VERSION_CODENAME) + endif +endif +.KATI_READONLY := PLATFORM_VERSION + + +ifeq (REL,$(PLATFORM_VERSION_CODENAME)) + PLATFORM_PREVIEW_SDK_VERSION := 0 +else + ifndef PLATFORM_PREVIEW_SDK_VERSION + # This is the definition of a preview SDK version over and above the current + # platform SDK version. Unlike the platform SDK version, a higher value + # for preview SDK version does NOT mean that all prior preview APIs are + # included. Packages reading this value to determine compatibility with + # known APIs should check that this value is precisely equal to the preview + # SDK version the package was built for, otherwise it should fall back to + # assuming the device can only support APIs as of the previous official + # public release. + # This value will always be forced to 0 for release builds by the logic + # in the "ifeq" block above, so the value below will be used on any + # non-release builds, and it should always be at least 1, to indicate that + # APIs may have changed since the claimed PLATFORM_SDK_VERSION. + PLATFORM_PREVIEW_SDK_VERSION := 1 + endif +endif +.KATI_READONLY := PLATFORM_PREVIEW_SDK_VERSION + +ifndef DEFAULT_APP_TARGET_SDK + # This is the default minSdkVersion and targetSdkVersion to use for + # all .apks created by the build system. It can be overridden by explicitly + # setting these in the .apk's AndroidManifest.xml. It is either the code + # name of the development build or, if this is a release build, the official + # SDK version of this release. + ifeq (REL,$(PLATFORM_VERSION_CODENAME)) + DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION) + else + DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME) + endif +endif +.KATI_READONLY := DEFAULT_APP_TARGET_SDK + +ifndef PLATFORM_VNDK_VERSION + # This is the definition of the VNDK version for the current VNDK libraries. + # The version is only available when PLATFORM_VERSION_CODENAME == REL. + # Otherwise, it will be set to a CODENAME version. The ABI is allowed to be + # changed only before the Android version is released. Once + # PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version + # will be frozon and emit build errors if any ABI for the VNDK libs are + # changed. + # After that the snapshot of the VNDK with this version will be generated. + # + # The VNDK version follows PLATFORM_SDK_VERSION. + ifeq (REL,$(PLATFORM_VERSION_CODENAME)) + PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION) + else + PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME) + endif +endif +.KATI_READONLY := PLATFORM_VNDK_VERSION + +ifndef PLATFORM_SYSTEMSDK_MIN_VERSION + # This is the oldest version of system SDK that the platform supports. Contrary + # to the public SDK where platform essentially supports all previous SDK versions, + # platform supports only a few number of recent system SDK versions as some of + # old system APIs are gradually deprecated, removed and then deleted. + PLATFORM_SYSTEMSDK_MIN_VERSION := 28 +endif +.KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION + +# This is the list of system SDK versions that the current platform supports. +PLATFORM_SYSTEMSDK_VERSIONS := +ifneq (,$(PLATFORM_SYSTEMSDK_MIN_VERSION)) + $(if $(call math_is_number,$(PLATFORM_SYSTEMSDK_MIN_VERSION)),,\ + $(error PLATFORM_SYSTEMSDK_MIN_VERSION must be a number, but was $(PLATFORM_SYSTEMSDK_MIN_VERSION))) + PLATFORM_SYSTEMSDK_VERSIONS := $(call int_range_list,$(PLATFORM_SYSTEMSDK_MIN_VERSION),$(PLATFORM_SDK_VERSION)) +endif +# Platform always supports the current version +ifeq (REL,$(PLATFORM_VERSION_CODENAME)) + PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION) +else + PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES)) +endif +PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS))) +.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS + +.KATI_READONLY := PLATFORM_SECURITY_PATCH + +ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP + # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH. + PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s) +endif +.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP + +ifndef PLATFORM_BASE_OS + # Used to indicate the base os applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_BASE_OS set, keep it empty. + PLATFORM_BASE_OS := +endif +.KATI_READONLY := PLATFORM_BASE_OS + +ifndef BUILD_ID + # Used to signify special builds. E.g., branches and/or releases, + # like "M5-RC7". Can be an arbitrary string, but must be a single + # word and a valid file name. + # + # If there is no BUILD_ID set, make it obvious. + BUILD_ID := UNKNOWN +endif +.KATI_READONLY := BUILD_ID + +ifndef BUILD_DATETIME + # Used to reproduce builds by setting the same time. Must be the number + # of seconds since the Epoch. + BUILD_DATETIME := $(shell date +%s) +endif + +DATE := date -d @$(BUILD_DATETIME) +.KATI_READONLY := DATE + +# Everything should be using BUILD_DATETIME_FROM_FILE instead. +# BUILD_DATETIME and DATE can be removed once BUILD_NUMBER moves +# to soong_ui. +$(KATI_obsolete_var BUILD_DATETIME,Use BUILD_DATETIME_FROM_FILE) + +HAS_BUILD_NUMBER := true +ifndef BUILD_NUMBER + # BUILD_NUMBER should be set to the source control value that + # represents the current state of the source code. E.g., a + # perforce changelist number or a git hash. Can be an arbitrary string + # (to allow for source control that uses something other than numbers), + # but must be a single word and a valid file name. + # + # If no BUILD_NUMBER is set, create a useful "I am an engineering build + # from this date/time" value. Make it start with a non-digit so that + # anyone trying to parse it as an integer will probably get "0". + BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) + HAS_BUILD_NUMBER := false +endif +.KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER + +ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION + # Used to set minimum supported target sdk version. Apps targeting sdk + # version lower than the set value will result in a warning being shown + # when any activity from the app is started. + PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23 +endif +.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION From e7cb2e6c8aa7162b722da3ae8d2dabbd2799b7f0 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 16 Sep 2021 19:01:41 +0000 Subject: [PATCH 120/191] [DO NOT MERGE] Update Security String to 2021-11-05 Bug: 199784479 Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289 --- 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 dcd0d1d435..01485dc1cf 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -86,7 +86,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 From 1509179e5bd22a4b755e403e5c707d644012d225 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 16 Sep 2021 19:01:41 +0000 Subject: [PATCH 121/191] [DO NOT MERGE] Update Security String to 2021-11-05 Bug: 199784479 Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289 Merged-In: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289 --- 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 f637b5d0df..c001c3bfe2 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 From 64044dda3e63b0e31cfdbca0a9cf98f84653a740 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 24 Sep 2021 00:41:01 +0000 Subject: [PATCH 122/191] Version bump to SP2A.210924.002 [core/build_id.mk] Change-Id: I5f7f43d53ea81cb03373cbea8fbe24e30cc3f2e6 --- 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 0f41a21cd4..3f2f12f447 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=SP2A.210924.001 +BUILD_ID=SP2A.210924.002 From 6487d1dfd74ae28ca7c6a4eae6ca2d224f91e559 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 24 Sep 2021 10:14:52 -0700 Subject: [PATCH 123/191] Update build_id.mk and version_defaults.mk for SC V2 Set BUILD_ID to "SC_V2". Bug: 201082421 Test: m checkbuild Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4 Change-Id: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780 --- 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..eee184e678 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_V2 From bf1f6248892e86655b482acb53c24ab43aa9ca93 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 1 Oct 2021 18:09:50 +0000 Subject: [PATCH 124/191] Version bump to SP2A.211001.002 [core/build_id.mk] Change-Id: Ic737f14097007dbbf6e03373574e48dca65328ba --- 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 6edc23585c..a92c53b6c3 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=SP2A.211001.001 +BUILD_ID=SP2A.211001.002 From 9f8c7a26cff891427e45ac8564175f205c32ac7a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 5 Oct 2021 18:07:54 +0000 Subject: [PATCH 125/191] Version bump to SP2A.211005.002 [core/build_id.mk] Change-Id: I2ee4f56b485a600a112eb2fe59faaa773dc5e9d3 --- 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 a9723b7d4c..f399e64b03 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=SP2A.211005.001 +BUILD_ID=SP2A.211005.002 From ec6022f2e57df692d17b8445845dd8b4d428a7b7 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 7 Oct 2021 21:48:10 +0000 Subject: [PATCH 126/191] Update SPL to 2021-12-01 Bug: 202436544 Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9 --- 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 437c173043..0c7e8039aa 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-11-01 + PLATFORM_SECURITY_PATCH := 2021-12-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 3838a433ee94fc930a3bf0e8642d06cd8dd0a54d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 11 Oct 2021 16:21:52 +0000 Subject: [PATCH 127/191] Version bump to SP2A.211011.002 [core/build_id.mk] Change-Id: If4a7d73399208b3e883fe6e754cd478d0a492900 --- 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 e8cde57c09..ca203c9734 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=SP2A.211011.001 +BUILD_ID=SP2A.211011.002 From 9cba3016fe1dbd045d5ecc5da281bf7702286647 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 11 Oct 2021 20:46:12 +0000 Subject: [PATCH 128/191] Update SPL to 2021-12-05 Bug: 202436544 Change-Id: Ic0dabce4beb09bdd966152c059730677ca5bf5aa Merged-In: Ie4645b81d47aa677c4237bda8303d6c2e502844f --- 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 c001c3bfe2..a5e40a0536 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-11-05 + PLATFORM_SECURITY_PATCH := 2021-12-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 16eff988abd58f6c788ff98954ff9e6199709451 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 7 Oct 2021 21:40:10 +0000 Subject: [PATCH 129/191] [DO NOT MERGE] Update SPL to 2021-12-05 Bug: 202436544 Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9 Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa --- 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 c864bb098e..f429d7c72c 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-11-05 + PLATFORM_SECURITY_PATCH := 2021-12-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 70713a7540042b583b011923e4f685991f188284 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 14 Oct 2021 23:47:46 +0000 Subject: [PATCH 130/191] Version bump to SP2A.211015.002 [core/build_id.mk] Change-Id: I04ccc12faa4fc0591af61e627783bbf299c43e9c --- 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 f0363769ef..635b004d1e 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=SP2A.211015.001 +BUILD_ID=SP2A.211015.002 From 636af52b42ba1a489577f40bef6feee6f3792657 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 20 Oct 2021 20:01:46 +0000 Subject: [PATCH 131/191] Version bump to SP2A.211020.002 [core/build_id.mk] Change-Id: I6c67a670650721bcae9bc8ea3fb6b4d1d4dfcfad --- 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 c09e8a5054..af7fe539c5 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=SP2A.211020.001 +BUILD_ID=SP2A.211020.002 From d6eb31d6972baa96cfdb425356744945adb6e35e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 21 Oct 2021 19:19:49 +0000 Subject: [PATCH 132/191] Version bump to SP2A.211021.002 [core/build_id.mk] Change-Id: I3f1ac16b30471875014ee0815fc174eddd714342 --- 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 24f40abb25..7e88c75d9f 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=SP2A.211021.001 +BUILD_ID=SP2A.211021.002 From 7cec1d3e70a36818653366cb6c86aaa4fd57f446 Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Tue, 7 Sep 2021 10:27:35 +0800 Subject: [PATCH 133/191] DO NOT MERGE Disable the delete_all_keys feature for GSI DO NOT MERGE as the main branch is fixed by aosp/1826054. Bug: 197914756 Bug: 203618478 Test: run GSI with DSU on a Pixel device Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b (cherry picked from commit 994e4a54f42808b369e8b28f16c52e0647fd8bb6) --- target/product/gsi_release.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 93b8c66f3c..09417b5f1f 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -78,3 +78,7 @@ PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false # Always build modules from source MODULE_BUILD_FROM_SOURCE := true + +# Additional settings used in all GSI builds +PRODUCT_PRODUCT_PROPERTIES += \ + ro.crypto.metadata_init_delete_all_keys.enabled=false \ From e1c13548281eb67988fe6ae0a4dd24afbb30a228 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 26 Oct 2021 17:49:44 +0000 Subject: [PATCH 134/191] Version bump to SP2A.211026.002 [core/build_id.mk] Change-Id: Ife788d5805c1c71c704f7ddc8739ed240200949a --- 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 a1f6d35d40..57464ce7e2 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=SP2A.211026.001 +BUILD_ID=SP2A.211026.002 From 81f061b57761309a807b43f889dbd991adb5fc6f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 27 Oct 2021 01:33:47 +0000 Subject: [PATCH 135/191] Version bump to SP2A.211027.002 [core/build_id.mk] Change-Id: I78f40da4e50a9a2cfa59c79cdc75e71538dc1be0 --- 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 f12fa2ca13..6a2563823f 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=SP2A.211027.001 +BUILD_ID=SP2A.211027.002 From 3dd45cab177945c7f226d7cb3326edc486ed8557 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Mon, 4 Oct 2021 21:26:43 +0000 Subject: [PATCH 136/191] Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486 Original change: https://android-review.googlesource.com/c/platform/build/+/1844555 Bug: 201591516 Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30 (cherry picked from commit 10218c724d1bd7a29d4ae9eacccdbb7f39682925) --- core/tasks/cts.mk | 4 ++-- core/tasks/tools/compatibility.mk | 10 ++++++++++ core/tasks/vts-core-tests.mk | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index fdd9591768..271ac12aec 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -20,8 +20,8 @@ test_suite_readme := cts/tools/cts-tradefed/README include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk .PHONY: cts -cts: $(compatibility_zip) -$(call dist-for-goals, cts, $(compatibility_zip)) +cts: $(compatibility_zip) $(compatibility_tests_list_zip) +$(call dist-for-goals, cts, $(compatibility_zip) $(compatibility_tests_list_zip)) .PHONY: cts_v2 cts_v2: cts diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 7d08a2f2e7..47cf4400dd 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -80,13 +80,18 @@ $(eval $(call combine-notice-files, html, \ compatibility_zip_deps += $(test_suite_notice_txt) compatibility_zip_resources += $(test_suite_notice_txt) +compatibility_tests_list_zip := $(out_dir)-tests_list.zip + compatibility_zip := $(out_dir).zip +$(compatibility_zip) : .KATI_IMPLICIT_OUTPUTS := $(compatibility_tests_list_zip) $(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir) $(compatibility_zip): PRIVATE_TOOLS := $(test_tools) $(test_suite_prebuilt_tools) $(compatibility_zip): PRIVATE_SUITE_NAME := $(test_suite_name) $(compatibility_zip): PRIVATE_DYNAMIC_CONFIG := $(test_suite_dynamic_config) $(compatibility_zip): PRIVATE_RESOURCES := $(compatibility_zip_resources) $(compatibility_zip): PRIVATE_JDK := $(test_suite_jdk) +$(compatibility_zip): PRIVATE_tests_list := $(out_dir)-tests_list +$(compatibility_zip): PRIVATE_tests_list_zip := $(compatibility_tests_list_zip) $(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) # Make dir structure mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases @@ -99,6 +104,11 @@ $(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) $(SOONG_ZIP) -d -o $@.tmp -C $(dir $@) -l $@.list $(MERGE_ZIPS) $@ $@.tmp $(PRIVATE_JDK) rm -f $@.tmp +# Build a list of tests + rm -f $(PRIVATE_tests_list) + $(hide) grep -e .*\\.config$$ $@.list | sed s%$(PRIVATE_OUT_DIR)/testcases/%%g > $(PRIVATE_tests_list) + $(SOONG_ZIP) -d -o $(PRIVATE_tests_list_zip) -j -f $(PRIVATE_tests_list) + rm -f $(PRIVATE_tests_list) # Reset all input variables test_suite_name := diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index 95c4d24a97..3c838b5695 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -44,7 +44,7 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk $(compatibility_zip): $(copy_kernel_tests) .PHONY: vts -vts: $(compatibility_zip) -$(call dist-for-goals, vts, $(compatibility_zip)) +vts: $(compatibility_zip) $(compatibility_tests_list_zip) +$(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip)) tests: vts From 51fb042cc222f8e0d5fe0f4962ad47f4539a15d7 Mon Sep 17 00:00:00 2001 From: Cheonho Park Date: Fri, 27 Aug 2021 12:03:18 +0000 Subject: [PATCH 137/191] Use findstring to check MODULE_BUILD_FROM_SOURCE Android 12 can have _compressed target (e.g com.google.android.conscrypt_compressed), changed function from `filter` to `findstring` Same change applied to com.google.android.art check Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE to filter out both unset variable and `false` Test: adding one error code temporally, install prebuilt train, and check result with,without this fix MODULE_BUILD_FROM_SOURCE := true + $(error we are here, true $(PRODUCT_PACKAGES)) endif Bug: 197282276 Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93 (cherry picked from commit 32c048c3796f259512e97fe054410787f18f9fb6) --- core/android_soong_config_vars.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 9d7c1bf820..5e63a25d9c 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -29,7 +29,7 @@ $(call add_soong_config_namespace,ANDROID) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) -ifeq (,$(filter com.google.android.conscrypt,$(PRODUCT_PACKAGES))) +ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))) # Prebuilt module SDKs require prebuilt modules to work, and currently # prebuilt modules are only provided for com.google.android.xxx. If we can't # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use, @@ -49,7 +49,7 @@ else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT))) # Always build from source for the module targets. This ought to be covered by # the TARGET_BUILD_APPS check above, but there are test builds that don't set it. SOONG_CONFIG_art_module_source_build := true -else ifdef MODULE_BUILD_FROM_SOURCE +else ifeq (true,$(MODULE_BUILD_FROM_SOURCE)) # Build from source if other Mainline modules are. SOONG_CONFIG_art_module_source_build := true else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE))) @@ -72,7 +72,7 @@ else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH))) else ifneq (,$(filter dex2oatds dex2oats,$(PRODUCT_HOST_PACKAGES))) # Some products depend on host tools that aren't available as prebuilts. SOONG_CONFIG_art_module_source_build := true -else ifeq (,$(filter com.google.android.art,$(PRODUCT_PACKAGES))) +else ifeq (,$(findstring com.google.android.art,$(PRODUCT_PACKAGES))) # TODO(b/192006406): There is currently no good way to control which prebuilt # APEX (com.google.android.art or com.android.art) gets picked for deapexing # to provide dex jars for hiddenapi and dexpreopting. Instead the AOSP APEX is @@ -90,6 +90,6 @@ ifdef APEX_BUILD_FOR_PRE_S_DEVICES $(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static) endif -ifdef MODULE_BUILD_FROM_SOURCE +ifeq (true,$(MODULE_BUILD_FROM_SOURCE)) $(call add_soong_config_var_value,ANDROID,module_build_from_source,true) endif From 7984c154fb5269e0b79f181f179be15c62ee1ca6 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 1 Nov 2021 20:31:57 +0000 Subject: [PATCH 138/191] Version bump to SP2A.211101.002 [core/build_id.mk] Change-Id: I1deea426dcc1edb8355b50581c264a899eacdd72 --- 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 d04b963720..04b7805eb3 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=SP2A.211101.001 +BUILD_ID=SP2A.211101.002 From 4010daa4bc46c05ae6b7f4997f5cc9ccf194c997 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 2 Nov 2021 15:12:02 +0000 Subject: [PATCH 139/191] Version bump to SP2A.211102.002 [core/build_id.mk] Change-Id: I678f75d53d78526099d468b7369e8baa6cba3ac7 --- 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 7adf80d9af..5bc93d536a 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=SP2A.211102.001 +BUILD_ID=SP2A.211102.002 From 0765f765c54796fae2bc554dc146717d0e7fff42 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 2 Nov 2021 18:53:50 +0000 Subject: [PATCH 140/191] Version bump to SP2A.211102.003 [core/build_id.mk] Change-Id: Ie244004749f3294faf4e3da5cb4c139d0b3b754e --- 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 5bc93d536a..5334f762ee 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=SP2A.211102.002 +BUILD_ID=SP2A.211102.003 From 24d3b887049a0928073d164f9bb5ae14a3e43c68 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 28 Oct 2021 16:42:21 +0100 Subject: [PATCH 141/191] S V2 is now 32 Bug: 204295952 Test: N/A Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2 Merged-In: I0627247e0b40c6c912584d55417671d20167b7c2 --- core/config.mk | 2 +- core/version_defaults.mk | 4 +- target/product/gsi/32.txt | 223 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 target/product/gsi/32.txt diff --git a/core/config.mk b/core/config.mk index 93c5db12d2..a086e5c7b4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -769,7 +769,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) # is made which breaks compatibility with the previous platform sepolicy version, # not just on every increase in PLATFORM_SDK_VERSION. The minor version should # be reset to 0 on every bump of the PLATFORM_SDK_VERSION. -sepolicy_major_vers := 31 +sepolicy_major_vers := 32 sepolicy_minor_vers := 0 ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION)) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a5e40a0536..488b0a49dd 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -88,7 +88,7 @@ MAX_PLATFORM_VERSION := # The last stable version name of the platform that was released. During # development, this stays at that previous version, while the codename indicates # further work based on the previous version. -PLATFORM_VERSION_LAST_STABLE := 12 +PLATFORM_VERSION_LAST_STABLE := 12L .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE # These are the current development codenames, if the build is not a final @@ -151,7 +151,7 @@ ifndef PLATFORM_SDK_VERSION # When you increment the PLATFORM_SDK_VERSION please ensure you also # clear out the following text file of all older PLATFORM_VERSION's: # cts/tests/tests/os/assets/platform_versions.txt - PLATFORM_SDK_VERSION := 31 + PLATFORM_SDK_VERSION := 32 endif .KATI_READONLY := PLATFORM_SDK_VERSION diff --git a/target/product/gsi/32.txt b/target/product/gsi/32.txt new file mode 100644 index 0000000000..971ec922a5 --- /dev/null +++ b/target/product/gsi/32.txt @@ -0,0 +1,223 @@ +LLNDK: libEGL.so +LLNDK: libGLESv1_CM.so +LLNDK: libGLESv2.so +LLNDK: libGLESv3.so +LLNDK: libRS.so +LLNDK: libandroid_net.so +LLNDK: libbinder_ndk.so +LLNDK: libc.so +LLNDK: libcgrouprc.so +LLNDK: libdl.so +LLNDK: libft2.so +LLNDK: liblog.so +LLNDK: libm.so +LLNDK: libmediandk.so +LLNDK: libnativewindow.so +LLNDK: libneuralnetworks.so +LLNDK: libselinux.so +LLNDK: libsync.so +LLNDK: libvndksupport.so +LLNDK: libvulkan.so +VNDK-SP: android.hardware.common-V2-ndk_platform.so +VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so +VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so +VNDK-SP: android.hardware.graphics.common@1.0.so +VNDK-SP: android.hardware.graphics.common@1.1.so +VNDK-SP: android.hardware.graphics.common@1.2.so +VNDK-SP: android.hardware.graphics.mapper@2.0.so +VNDK-SP: android.hardware.graphics.mapper@2.1.so +VNDK-SP: android.hardware.graphics.mapper@3.0.so +VNDK-SP: android.hardware.graphics.mapper@4.0.so +VNDK-SP: android.hardware.renderscript@1.0.so +VNDK-SP: android.hidl.memory.token@1.0.so +VNDK-SP: android.hidl.memory@1.0-impl.so +VNDK-SP: android.hidl.memory@1.0.so +VNDK-SP: android.hidl.safe_union@1.0.so +VNDK-SP: libRSCpuRef.so +VNDK-SP: libRSDriver.so +VNDK-SP: libRS_internal.so +VNDK-SP: libbacktrace.so +VNDK-SP: libbase.so +VNDK-SP: libbcinfo.so +VNDK-SP: libblas.so +VNDK-SP: libc++.so +VNDK-SP: libcompiler_rt.so +VNDK-SP: libcutils.so +VNDK-SP: libdmabufheap.so +VNDK-SP: libgralloctypes.so +VNDK-SP: libhardware.so +VNDK-SP: libhidlbase.so +VNDK-SP: libhidlmemory.so +VNDK-SP: libion.so +VNDK-SP: libjsoncpp.so +VNDK-SP: liblzma.so +VNDK-SP: libprocessgroup.so +VNDK-SP: libunwindstack.so +VNDK-SP: libutils.so +VNDK-SP: libutilscallstack.so +VNDK-SP: libz.so +VNDK-core: android.hardware.audio.common@2.0.so +VNDK-core: android.hardware.authsecret-V1-ndk_platform.so +VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so +VNDK-core: android.hardware.configstore-utils.so +VNDK-core: android.hardware.configstore@1.0.so +VNDK-core: android.hardware.configstore@1.1.so +VNDK-core: android.hardware.confirmationui-support-lib.so +VNDK-core: android.hardware.gnss-V1-ndk_platform.so +VNDK-core: android.hardware.graphics.allocator@2.0.so +VNDK-core: android.hardware.graphics.allocator@3.0.so +VNDK-core: android.hardware.graphics.allocator@4.0.so +VNDK-core: android.hardware.graphics.bufferqueue@1.0.so +VNDK-core: android.hardware.graphics.bufferqueue@2.0.so +VNDK-core: android.hardware.health.storage-V1-ndk_platform.so +VNDK-core: android.hardware.identity-V3-ndk_platform.so +VNDK-core: android.hardware.keymaster-V3-ndk_platform.so +VNDK-core: android.hardware.light-V1-ndk_platform.so +VNDK-core: android.hardware.media.bufferpool@2.0.so +VNDK-core: android.hardware.media.omx@1.0.so +VNDK-core: android.hardware.media@1.0.so +VNDK-core: android.hardware.memtrack-V1-ndk_platform.so +VNDK-core: android.hardware.memtrack@1.0.so +VNDK-core: android.hardware.oemlock-V1-ndk_platform.so +VNDK-core: android.hardware.power-V2-ndk_platform.so +VNDK-core: android.hardware.power.stats-V1-ndk_platform.so +VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so +VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so +VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so +VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so +VNDK-core: android.hardware.soundtrigger@2.0-core.so +VNDK-core: android.hardware.soundtrigger@2.0.so +VNDK-core: android.hardware.vibrator-V2-ndk_platform.so +VNDK-core: android.hardware.weaver-V1-ndk_platform.so +VNDK-core: android.hidl.token@1.0-utils.so +VNDK-core: android.hidl.token@1.0.so +VNDK-core: android.system.keystore2-V1-ndk_platform.so +VNDK-core: android.system.suspend@1.0.so +VNDK-core: libaudioroute.so +VNDK-core: libaudioutils.so +VNDK-core: libbinder.so +VNDK-core: libbufferqueueconverter.so +VNDK-core: libcamera_metadata.so +VNDK-core: libcap.so +VNDK-core: libcn-cbor.so +VNDK-core: libcodec2.so +VNDK-core: libcrypto.so +VNDK-core: libcrypto_utils.so +VNDK-core: libcurl.so +VNDK-core: libdiskconfig.so +VNDK-core: libdumpstateutil.so +VNDK-core: libevent.so +VNDK-core: libexif.so +VNDK-core: libexpat.so +VNDK-core: libfmq.so +VNDK-core: libgatekeeper.so +VNDK-core: libgui.so +VNDK-core: libhardware_legacy.so +VNDK-core: libhidlallocatorutils.so +VNDK-core: libjpeg.so +VNDK-core: libldacBT_abr.so +VNDK-core: libldacBT_enc.so +VNDK-core: liblz4.so +VNDK-core: libmedia_helper.so +VNDK-core: libmedia_omx.so +VNDK-core: libmemtrack.so +VNDK-core: libminijail.so +VNDK-core: libmkbootimg_abi_check.so +VNDK-core: libnetutils.so +VNDK-core: libnl.so +VNDK-core: libpcre2.so +VNDK-core: libpiex.so +VNDK-core: libpng.so +VNDK-core: libpower.so +VNDK-core: libprocinfo.so +VNDK-core: libradio_metadata.so +VNDK-core: libspeexresampler.so +VNDK-core: libsqlite.so +VNDK-core: libssl.so +VNDK-core: libstagefright_bufferpool@2.0.so +VNDK-core: libstagefright_bufferqueue_helper.so +VNDK-core: libstagefright_foundation.so +VNDK-core: libstagefright_omx.so +VNDK-core: libstagefright_omx_utils.so +VNDK-core: libstagefright_xmlparser.so +VNDK-core: libsysutils.so +VNDK-core: libtinyalsa.so +VNDK-core: libtinyxml2.so +VNDK-core: libui.so +VNDK-core: libusbhost.so +VNDK-core: libwifi-system-iface.so +VNDK-core: libxml2.so +VNDK-core: libyuv.so +VNDK-core: libziparchive.so +VNDK-private: libbacktrace.so +VNDK-private: libblas.so +VNDK-private: libcompiler_rt.so +VNDK-private: libft2.so +VNDK-private: libgui.so +VNDK-product: android.hardware.audio.common@2.0.so +VNDK-product: android.hardware.configstore@1.0.so +VNDK-product: android.hardware.configstore@1.1.so +VNDK-product: android.hardware.graphics.allocator@2.0.so +VNDK-product: android.hardware.graphics.allocator@3.0.so +VNDK-product: android.hardware.graphics.allocator@4.0.so +VNDK-product: android.hardware.graphics.bufferqueue@1.0.so +VNDK-product: android.hardware.graphics.bufferqueue@2.0.so +VNDK-product: android.hardware.graphics.common@1.0.so +VNDK-product: android.hardware.graphics.common@1.1.so +VNDK-product: android.hardware.graphics.common@1.2.so +VNDK-product: android.hardware.graphics.mapper@2.0.so +VNDK-product: android.hardware.graphics.mapper@2.1.so +VNDK-product: android.hardware.graphics.mapper@3.0.so +VNDK-product: android.hardware.graphics.mapper@4.0.so +VNDK-product: android.hardware.media.bufferpool@2.0.so +VNDK-product: android.hardware.media.omx@1.0.so +VNDK-product: android.hardware.media@1.0.so +VNDK-product: android.hardware.memtrack@1.0.so +VNDK-product: android.hardware.renderscript@1.0.so +VNDK-product: android.hardware.soundtrigger@2.0.so +VNDK-product: android.hidl.memory.token@1.0.so +VNDK-product: android.hidl.memory@1.0.so +VNDK-product: android.hidl.safe_union@1.0.so +VNDK-product: android.hidl.token@1.0.so +VNDK-product: android.system.suspend@1.0.so +VNDK-product: libaudioutils.so +VNDK-product: libbacktrace.so +VNDK-product: libbase.so +VNDK-product: libc++.so +VNDK-product: libcamera_metadata.so +VNDK-product: libcap.so +VNDK-product: libcompiler_rt.so +VNDK-product: libcrypto.so +VNDK-product: libcurl.so +VNDK-product: libcutils.so +VNDK-product: libevent.so +VNDK-product: libexpat.so +VNDK-product: libfmq.so +VNDK-product: libhidlbase.so +VNDK-product: libhidlmemory.so +VNDK-product: libion.so +VNDK-product: libjpeg.so +VNDK-product: libjsoncpp.so +VNDK-product: libldacBT_abr.so +VNDK-product: libldacBT_enc.so +VNDK-product: liblz4.so +VNDK-product: liblzma.so +VNDK-product: libminijail.so +VNDK-product: libnl.so +VNDK-product: libpcre2.so +VNDK-product: libpiex.so +VNDK-product: libpng.so +VNDK-product: libprocessgroup.so +VNDK-product: libprocinfo.so +VNDK-product: libspeexresampler.so +VNDK-product: libssl.so +VNDK-product: libtinyalsa.so +VNDK-product: libtinyxml2.so +VNDK-product: libunwindstack.so +VNDK-product: libutils.so +VNDK-product: libutilscallstack.so +VNDK-product: libwifi-system-iface.so +VNDK-product: libxml2.so +VNDK-product: libyuv.so +VNDK-product: libz.so +VNDK-product: libziparchive.so From c22937991f2f0bccd29c656fb6844b16f2dc6605 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 9 Nov 2021 19:01:58 +0000 Subject: [PATCH 142/191] Version bump to SP2A.211109.002 [core/build_id.mk] Change-Id: I244c5bc9ec764fc325c5df7c68a804bd3865a983 --- 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 fa17277729..3785273401 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=SP2A.211109.001 +BUILD_ID=SP2A.211109.002 From 65a7e5e2bd6fd90f20cbfec9a4563ae2afc41764 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 29 Oct 2021 23:07:55 +0100 Subject: [PATCH 143/191] S V2 is now REL Bug: 204295952 Test: N/A Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4 Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4 --- core/version_defaults.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d575f906c3..9db2237736 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -52,7 +52,6 @@ PLATFORM_VERSION_LAST_STABLE := 12L # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.SP2A := Sv2 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu ifndef PLATFORM_SDK_VERSION From 6eea9cc948bbb03de95a90a8e546ba3faf26ebdb Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 12 Nov 2021 17:41:42 +0000 Subject: [PATCH 144/191] Version bump to SP2A.211112.002 [core/build_id.mk] Change-Id: I44ba609b4fbcbbc61982097d18f6ece9b986e1c2 --- 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 253e8cfba3..03dc57922a 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=SP2A.211112.001 +BUILD_ID=SP2A.211112.002 From 42f68fbf39ac65fbafaae89d4807be03367cd24b Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Mon, 15 Nov 2021 21:04:40 +0000 Subject: [PATCH 145/191] Revert back to 12 instead of 12L Bug: 206132499 Bug: 204295952 Test: N/A Change-Id: I7f87d189030e97f47dc81b756d1397b4aa65daf0 --- 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 9db2237736..211c7448a6 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -47,7 +47,7 @@ MAX_PLATFORM_VERSION := TP1A # The last stable version name of the platform that was released. During # development, this stays at that previous version, while the codename indicates # further work based on the previous version. -PLATFORM_VERSION_LAST_STABLE := 12L +PLATFORM_VERSION_LAST_STABLE := 12 .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE # These are the current development codenames, if the build is not a final From 5be855c25011bb302b2dd01a6a35308ceaa6a675 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Mon, 15 Nov 2021 19:11:14 +0000 Subject: [PATCH 146/191] Revert platform version to 12 Bug: 204295952 Test: N/A Change-Id: I899af9326e95b4fcfb778f84b748f56834d54ca8 Merged-In: I7f87d189030e97f47dc81b756d1397b4aa65daf0 --- 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 488b0a49dd..25cefc21e3 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -88,7 +88,7 @@ MAX_PLATFORM_VERSION := # The last stable version name of the platform that was released. During # development, this stays at that previous version, while the codename indicates # further work based on the previous version. -PLATFORM_VERSION_LAST_STABLE := 12L +PLATFORM_VERSION_LAST_STABLE := 12 .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE # These are the current development codenames, if the build is not a final From 32d117dd52b64663719131f4d85e51ed647f20ff Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 29 Oct 2021 23:07:55 +0100 Subject: [PATCH 147/191] S V2 is now REL Bug: 204295952 Test: N/A Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4 Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4 --- 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 25cefc21e3..1c193eec37 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.SP2A := Sv2 +PLATFORM_VERSION_CODENAME.SP2A := REL ifndef PLATFORM_VERSION_CODENAME PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) From 35aff849a648b962b645dd14a3025855530f2e24 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 17 Nov 2021 19:57:50 +0000 Subject: [PATCH 148/191] Version bump to SP2A.211117.002 [core/build_id.mk] Change-Id: I8d7da4128d05e8008037cb1d47bb09fd768e56f8 --- 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 9984045d73..e182414f79 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=SP2A.211117.001 +BUILD_ID=SP2A.211117.002 From c401c44c382f1420271170442b60a9236f2e4547 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 17 Nov 2021 21:49:52 +0000 Subject: [PATCH 149/191] Version bump to SP2A.211117.003 [core/build_id.mk] Change-Id: I270d0c43601df694ae582fdc8e977b9cabd6cd05 --- 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 e182414f79..5a0bd15074 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=SP2A.211117.002 +BUILD_ID=SP2A.211117.003 From 9f7a1aab56d2499143ccb516d79e6dd37a16d2a7 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 18 Nov 2021 16:43:50 +0000 Subject: [PATCH 150/191] Version bump to SP2A.211118.002 [core/build_id.mk] Change-Id: I4cf34e20df72e2877f9ce06e34b7ea3ea6e3cb77 --- 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 45561c88dd..ad5b403632 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=SP2A.211118.001 +BUILD_ID=SP2A.211118.002 From db0d3115ad9399ac3166606c91c449427fe11260 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 18 Nov 2021 23:47:56 +0000 Subject: [PATCH 151/191] Version bump to SP2A.211118.003 [core/build_id.mk] Change-Id: I1436e715f1bfed596049f1317486bfdff46a23fc --- 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 ad5b403632..4493d3a6f3 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=SP2A.211118.002 +BUILD_ID=SP2A.211118.003 From 09a8ffe8ad4a65575ce95dc9dac6751b7f4d8622 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 19 Nov 2021 00:45:51 +0000 Subject: [PATCH 152/191] Version bump to SP2A.211119.002 [core/build_id.mk] Change-Id: Ie906937ab33285be0953b48ecd61bfb911974201 --- 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 87f78997e6..2bda7c2608 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=SP2A.211119.001 +BUILD_ID=SP2A.211119.002 From 227d6711b135266cfede27f3b3db7924b32c4403 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 22 Nov 2021 01:49:58 +0000 Subject: [PATCH 153/191] Version bump to SP2A.211122.002 [core/build_id.mk] Change-Id: I40d52afcac964ca42220f1be499f5623a3777a82 --- 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 3f74119dc6..70b79a6d70 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=SP2A.211122.001 +BUILD_ID=SP2A.211122.002 From d29e8b2db80494f0578920532b0bdd1852c86c09 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 16 Jun 2021 09:46:59 +0900 Subject: [PATCH 154/191] Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS Bug: 189161483 Bug: 207344718 Test: m selinux_policy Change-Id: I48b681fb28c78ea9dca922f5fb58f19a940c1a51 Merged-In: I48b681fb28c78ea9dca922f5fb58f19a940c1a51 (cherry picked from commit 94c27efb68b124fad1f291fb7c3865777403d20f) --- core/config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config.mk b/core/config.mk index a086e5c7b4..5a0a51ee29 100644 --- a/core/config.mk +++ b/core/config.mk @@ -792,6 +792,7 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \ 28.0 \ 29.0 \ 30.0 \ + 31.0 \ .KATI_READONLY := \ PLATFORM_SEPOLICY_COMPAT_VERSIONS \ From 9e20227ea50a20b0b014e33fde3bf8f3589c6416 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 18 Nov 2021 22:19:30 +0000 Subject: [PATCH 155/191] [DO NOT MERGE] Update Security String to 2022-01-05 Bug: 207022948 Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 --- 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 f429d7c72c..47bb92c142 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-12-05 + PLATFORM_SECURITY_PATCH := 2022-01-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From af5392280c9b08241f6d6b01daceeac2cd308bf5 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 23 Nov 2021 23:25:54 +0000 Subject: [PATCH 156/191] Update Security String to 2022-01-01 Bug: 207022948 Change-Id: I4fa24056c5f6a4847431fdd28ff614e851746314 Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 --- 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 0c7e8039aa..21598c4732 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-12-01 + PLATFORM_SECURITY_PATCH := 2022-01-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From ea4df1b901dc7dd8eb8af825e2e9c3ecb467a28e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 24 Nov 2021 00:23:27 +0000 Subject: [PATCH 157/191] Update Security String to 2022-01-05 Bug: 207022948 Change-Id: If34c71239a446a49d4521116a35b28418cfcd350 Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 --- 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 1c193eec37..40c506c75b 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-12-05 + PLATFORM_SECURITY_PATCH := 2022-01-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ab77473ace736075a01828827894949788186fec Mon Sep 17 00:00:00 2001 From: Nahian Ashraf Date: Wed, 24 Nov 2021 03:15:49 +0000 Subject: [PATCH 158/191] DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND" Revert submission 1859096-remove_ndk_platform Reason for revert: Build Breakage Reverted Changes: I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND I1cbdce916:Don't generate the ndk_platform backend unless exp... Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296 --- core/soong_config.mk | 2 -- target/product/gsi/Android.mk | 24 +++++------------------- target/product/gsi/current.txt | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index 837ed4f071..49994646d4 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -271,8 +271,6 @@ $(call add_json_bool, SepolicySplit, $(filter true,$(PRODUCT_SEPOLICY_SPLIT))) $(call add_json_list, SepolicyFreezeTestExtraDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_DIRS)) $(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_PREBUILT_DIRS)) -$(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_NDK_PLATFORM_BACKEND))) - $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 0d788fad44..39848e534a 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -50,21 +50,11 @@ else _vndk_check_failure_message += " Run \`update-vndk-list.sh\` to update $(LATEST_VNDK_LIB_LIST)" endif -# The *-ndk_platform.so libraries no longer exist and are removed from the VNDK set. However, they -# can exist if NEED_AIDL_NDK_PLATFORM_BACKEND is set to true for legacy devices. Don't be bothered -# with the extraneous libraries. -ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true) - _READ_INTERNAL_VNDK_LIB_LIST := sed /ndk_platform.so/d $(INTERNAL_VNDK_LIB_LIST) -else - _READ_INTERNAL_VNDK_LIB_LIST := cat $(INTERNAL_VNDK_LIB_LIST) -endif - $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh - $(hide) ($(_READ_INTERNAL_VNDK_LIB_LIST) | \ - diff --old-line-format="Removed %L" \ + $(hide) ( diff --old-line-format="Removed %L" \ --new-line-format="Added %L" \ --unchanged-line-format="" \ - $(LATEST_VNDK_LIB_LIST) - \ + $(LATEST_VNDK_LIB_LIST) $(INTERNAL_VNDK_LIB_LIST) \ || ( echo -e $(_vndk_check_failure_message); exit 1 )) $(hide) mkdir -p $(dir $@) $(hide) touch $@ @@ -94,13 +84,9 @@ else echo " echo Run lunch or choosecombo first" >> $@; \ echo " exit 1" >> $@; \ echo "fi" >> $@; \ - echo "cd \$${ANDROID_BUILD_TOP}" >> $@ -ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true) - $(hide) echo "sed /ndk_platform.so/d $(PRIVATE_INTERNAL_VNDK_LIB_LIST) > $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@ -else - $(hide) echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@ -endif - $(hide) echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@ + echo "cd \$${ANDROID_BUILD_TOP}" >> $@; \ + echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@; \ + echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@ endif @chmod a+x $@ diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 0dd5932348..399652cb81 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -19,8 +19,11 @@ LLNDK: libsync.so LLNDK: libvndksupport.so LLNDK: libvulkan.so VNDK-SP: android.hardware.common-V2-ndk.so +VNDK-SP: android.hardware.common-V2-ndk_platform.so VNDK-SP: android.hardware.common.fmq-V1-ndk.so +VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so VNDK-SP: android.hardware.graphics.common-V2-ndk.so +VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so VNDK-SP: android.hardware.graphics.common@1.0.so VNDK-SP: android.hardware.graphics.common@1.1.so VNDK-SP: android.hardware.graphics.common@1.2.so @@ -58,12 +61,15 @@ VNDK-SP: libutilscallstack.so VNDK-SP: libz.so VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.authsecret-V1-ndk.so +VNDK-core: android.hardware.authsecret-V1-ndk_platform.so VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so +VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so VNDK-core: android.hardware.configstore-utils.so VNDK-core: android.hardware.configstore@1.0.so VNDK-core: android.hardware.configstore@1.1.so VNDK-core: android.hardware.confirmationui-support-lib.so VNDK-core: android.hardware.gnss-V1-ndk.so +VNDK-core: android.hardware.gnss-V1-ndk_platform.so VNDK-core: android.hardware.graphics.allocator@2.0.so VNDK-core: android.hardware.graphics.allocator@3.0.so VNDK-core: android.hardware.graphics.allocator@4.0.so @@ -71,38 +77,63 @@ VNDK-core: android.hardware.graphics.bufferqueue@1.0.so VNDK-core: android.hardware.graphics.bufferqueue@2.0.so VNDK-core: android.hardware.health-V1-ndk.so VNDK-core: android.hardware.health.storage-V1-ndk.so +VNDK-core: android.hardware.health.storage-V1-ndk_platform.so VNDK-core: android.hardware.identity-V3-ndk.so +VNDK-core: android.hardware.identity-V3-ndk_platform.so VNDK-core: android.hardware.keymaster-V3-ndk.so +VNDK-core: android.hardware.keymaster-V3-ndk_platform.so VNDK-core: android.hardware.light-V1-ndk.so +VNDK-core: android.hardware.light-V1-ndk_platform.so VNDK-core: android.hardware.media.bufferpool@2.0.so VNDK-core: android.hardware.media.omx@1.0.so VNDK-core: android.hardware.media@1.0.so VNDK-core: android.hardware.memtrack-V1-ndk.so +VNDK-core: android.hardware.memtrack-V1-ndk_platform.so VNDK-core: android.hardware.memtrack@1.0.so VNDK-core: android.hardware.oemlock-V1-ndk.so +VNDK-core: android.hardware.oemlock-V1-ndk_platform.so VNDK-core: android.hardware.power-V2-ndk.so +VNDK-core: android.hardware.power-V2-ndk_platform.so VNDK-core: android.hardware.power.stats-V1-ndk.so +VNDK-core: android.hardware.power.stats-V1-ndk_platform.so VNDK-core: android.hardware.radio-V1-ndk.so +VNDK-core: android.hardware.radio-V1-ndk_platform.so VNDK-core: android.hardware.radio.config-V1-ndk.so +VNDK-core: android.hardware.radio.config-V1-ndk_platform.so VNDK-core: android.hardware.radio.data-V1-ndk.so +VNDK-core: android.hardware.radio.data-V1-ndk_platform.so VNDK-core: android.hardware.radio.messaging-V1-ndk.so +VNDK-core: android.hardware.radio.messaging-V1-ndk_platform.so VNDK-core: android.hardware.radio.modem-V1-ndk.so +VNDK-core: android.hardware.radio.modem-V1-ndk_platform.so VNDK-core: android.hardware.radio.network-V1-ndk.so +VNDK-core: android.hardware.radio.network-V1-ndk_platform.so VNDK-core: android.hardware.radio.sim-V1-ndk.so +VNDK-core: android.hardware.radio.sim-V1-ndk_platform.so VNDK-core: android.hardware.radio.voice-V1-ndk.so +VNDK-core: android.hardware.radio.voice-V1-ndk_platform.so VNDK-core: android.hardware.rebootescrow-V1-ndk.so +VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so VNDK-core: android.hardware.security.keymint-V1-ndk.so +VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so VNDK-core: android.hardware.security.secureclock-V1-ndk.so +VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so +VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so VNDK-core: android.hardware.soundtrigger@2.0-core.so VNDK-core: android.hardware.soundtrigger@2.0.so VNDK-core: android.hardware.vibrator-V2-ndk.so +VNDK-core: android.hardware.vibrator-V2-ndk_platform.so VNDK-core: android.hardware.weaver-V1-ndk.so +VNDK-core: android.hardware.weaver-V1-ndk_platform.so VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so +VNDK-core: android.hardware.wifi.hostapd-V1-ndk_platform.so VNDK-core: android.hidl.token@1.0-utils.so VNDK-core: android.hidl.token@1.0.so VNDK-core: android.system.keystore2-V1-ndk.so +VNDK-core: android.system.keystore2-V1-ndk_platform.so VNDK-core: android.system.suspend-V1-ndk.so +VNDK-core: android.system.suspend-V1-ndk_platform.so VNDK-core: android.system.suspend@1.0.so VNDK-core: libaudioroute.so VNDK-core: libaudioutils.so From d395c6ff3f31126f1bf2c0a08c96a8f185d594b1 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Sat, 11 Sep 2021 19:31:28 +0800 Subject: [PATCH 159/191] Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT If this option is set, then an additional copy of the debug policy can be installed to the GSI, and the init-second-stage of GSI could load debug policy from GSI /system_ext when debug-ramdisk is used. Bug: 188067818 Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash gsi_arm64-user from master, device can boot and `adb root` works Change-Id: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8 Merged-In: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8 (cherry picked from commit 0a468fe904768240fe011f1c47fa89b3165c265c) --- core/android_soong_config_vars.mk | 1 + core/product.mk | 5 +++++ core/product_config.mk | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 5e63a25d9c..1b4aeb558e 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -28,6 +28,7 @@ $(call add_soong_config_namespace,ANDROID) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) +$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))) # Prebuilt module SDKs require prebuilt modules to work, and currently diff --git a/core/product.mk b/core/product.mk index 015fe44ba9..21fc06e65f 100644 --- a/core/product.mk +++ b/core/product.mk @@ -427,6 +427,11 @@ _product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST _product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES +# Install a copy of the debug policy to the system_ext partition, and allow +# init-second-stage to load debug policy from system_ext. +# This option is only meant to be set by GSI products. +_product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT + .KATI_READONLY := _product_single_value_vars _product_list_vars _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) diff --git a/core/product_config.mk b/core/product_config.mk index 5c85fb85f1..679453e522 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -350,6 +350,12 @@ ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),) $(error Only one file may be in PRODUCT_ADB_KEYS: $(PRODUCT_ADB_KEYS)) endif +ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT + ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64,$(PRODUCT_NAME))) + $(error Only GSI products are allowed to set PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) + endif +endif + ifndef PRODUCT_USE_DYNAMIC_PARTITIONS PRODUCT_USE_DYNAMIC_PARTITIONS := $(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS) endif From 00fc943377a110e7c31faa49d9deb09a660ffc53 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 9 Sep 2021 19:04:55 +0800 Subject: [PATCH 160/191] Skip building boot-(test-harness|debug).img if not needed boot-(test-harness|debug).img is not needed for devices with a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img instead. (Cherry-picked with Ic032b8594f776f911d7b6345a97d64fed930d890 to solve merge conflict.) Bug: 200945738 Bug: 196001476 Test: make then checks $OUT/*.img Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6 Merged-In: If76df0329c96f718ebf0a0ac138cde3ae859a6c6 (cherry picked from commit 4bb4d1fb9165b124f67bb6f405503ca4ae1ecef2) --- core/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/Makefile b/core/Makefile index 2d56edb9ee..a10e93d68f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2398,6 +2398,7 @@ endif # BUILDING_RAMDISK_IMAGE # # Note: it's intentional to skip signing for boot-debug.img, because it # can only be used if the device is unlocked with verification error. +ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) ifneq ($(strip $(TARGET_NO_KERNEL)),true) ifneq ($(strip $(BOARD_KERNEL_BINARIES)),) @@ -2456,6 +2457,7 @@ bootimage_debug-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL) endif # TARGET_NO_KERNEL endif # INSTALLED_BOOTIMAGE_TARGET +endif # BUILDING_VENDOR_BOOT_IMAGE is not true ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifeq ($(BUILDING_RAMDISK_IMAGE),true) @@ -2601,6 +2603,7 @@ endif # BUILDING_RAMDISK_IMAGE # # Note: it's intentional to skip signing for boot-test-harness.img, because it # can only be used if the device is unlocked with verification error. +ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) ifneq ($(strip $(TARGET_NO_KERNEL)),true) @@ -2643,6 +2646,7 @@ bootimage_test_harness-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBT endif # TARGET_NO_KERNEL endif # INSTALLED_BOOTIMAGE_TARGET +endif # BUILDING_VENDOR_BOOT_IMAGE is not true endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) From 8d2495319bad51afc794717f085625ee0a60e904 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Wed, 29 Sep 2021 19:41:11 +0800 Subject: [PATCH 161/191] Refactor build logic of boot-debug & vendor_boot-debug Add PRODUCT variables PRODUCT_BUILD_DEBUG_BOOT_IMAGE PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE as toggles to enable/disable building boot-debug & vendor_boot-debug. Bug: 200945738 Test: m bootimage_debug Change-Id: Ic032b8594f776f911d7b6345a97d64fed930d890 Merged-In: Ic032b8594f776f911d7b6345a97d64fed930d890 (cherry picked from commit 4d7c613c58cb0578893996887e8270a3bd8cb069) --- core/Makefile | 43 +++++++++--------------- core/board_config.mk | 80 ++++++++++++++++++++++++++++++++++++++++++++ core/product.mk | 2 ++ 3 files changed, 98 insertions(+), 27 deletions(-) diff --git a/core/Makefile b/core/Makefile index a10e93d68f..a6959fac94 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2327,14 +2327,14 @@ ifneq ($(BOARD_NAND_SPARE_SIZE),) $(error MTD device is no longer supported and thus BOARD_NAND_SPARE_SIZE is deprecated.) endif -ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) + # ----------------------------------------------------------------- # the debug ramdisk, which is the original ramdisk plus additional # files: force_debuggable, adb_debug.prop and userdebug sepolicy. # When /force_debuggable is present, /init will load userdebug sepolicy # and property files to allow adb root, if the device is unlocked. +ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),) -ifdef BUILDING_RAMDISK_IMAGE BUILT_DEBUG_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-debug.img INSTALLED_DEBUG_RAMDISK_TARGET := $(BUILT_DEBUG_RAMDISK_TARGET) @@ -2391,16 +2391,15 @@ ramdisk_debug-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS) touch $(TARGET_DEBUG_RAMDISK_OUT)/force_debuggable $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_DEBUG_RAMDISK_TARGET) -endif # BUILDING_RAMDISK_IMAGE +endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE # ----------------------------------------------------------------- # the boot-debug.img, which is the kernel plus ramdisk-debug.img # # Note: it's intentional to skip signing for boot-debug.img, because it # can only be used if the device is unlocked with verification error. -ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true) -ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) -ifneq ($(strip $(TARGET_NO_KERNEL)),true) +ifdef BUILDING_DEBUG_BOOT_IMAGE + ifneq ($(strip $(BOARD_KERNEL_BINARIES)),) INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \ $(PRODUCT_OUT)/$(k).img) @@ -2455,16 +2454,13 @@ bootimage_debug-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL) echo "make $@: ignoring dependencies" $(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b)) -endif # TARGET_NO_KERNEL -endif # INSTALLED_BOOTIMAGE_TARGET -endif # BUILDING_VENDOR_BOOT_IMAGE is not true +endif # BUILDING_DEBUG_BOOT_IMAGE -ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) -ifeq ($(BUILDING_RAMDISK_IMAGE),true) # ----------------------------------------------------------------- # vendor debug ramdisk # Combines vendor ramdisk files and debug ramdisk files to build the vendor debug ramdisk. -# +ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE + INTERNAL_VENDOR_DEBUG_RAMDISK_FILES := $(filter $(TARGET_VENDOR_DEBUG_RAMDISK_OUT)/%, \ $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) @@ -2536,14 +2532,13 @@ $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET): $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_T $(call assert-max-image-size,$@,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE)) $(if $(BOARD_AVB_VENDOR_BOOT_KEY_PATH),$(call test-key-sign-vendor-bootimage,$@)) -endif # BUILDING_RAMDISK_IMAGE -endif # BUILDING_VENDOR_BOOT_IMAGE +endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE # ----------------------------------------------------------------- # The test harness ramdisk, which is based off debug_ramdisk, plus a # few additional test-harness-specific properties in adb_debug.prop. +ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),) -ifdef BUILDING_RAMDISK_IMAGE BUILT_TEST_HARNESS_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-test-harness.img INSTALLED_TEST_HARNESS_RAMDISK_TARGET := $(BUILT_TEST_HARNESS_RAMDISK_TARGET) @@ -2596,16 +2591,14 @@ ramdisk_test_harness-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS) $(call append-test-harness-props,$(ADDITIONAL_TEST_HARNESS_PROPERTIES),$(TEST_HARNESS_PROP_TARGET)) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET) -endif # BUILDING_RAMDISK_IMAGE +endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE # ----------------------------------------------------------------- # the boot-test-harness.img, which is the kernel plus ramdisk-test-harness.img # # Note: it's intentional to skip signing for boot-test-harness.img, because it # can only be used if the device is unlocked with verification error. -ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true) -ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) -ifneq ($(strip $(TARGET_NO_KERNEL)),true) +ifdef BUILDING_DEBUG_BOOT_IMAGE ifneq ($(strip $(BOARD_KERNEL_BINARIES)),) INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-test-harness,$(BOARD_KERNEL_BINARIES)), \ @@ -2644,16 +2637,12 @@ bootimage_test_harness-nodeps: $(MKBOOTIMG) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBT echo "make $@: ignoring dependencies" $(foreach b,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),$(call build-boot-test-harness-target,$b)) -endif # TARGET_NO_KERNEL -endif # INSTALLED_BOOTIMAGE_TARGET -endif # BUILDING_VENDOR_BOOT_IMAGE is not true -endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true +endif # BUILDING_DEBUG_BOOT_IMAGE -ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) -ifeq ($(BUILDING_RAMDISK_IMAGE),true) # ----------------------------------------------------------------- # vendor test harness ramdisk, which is a vendor ramdisk combined with # a test harness ramdisk. +ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_boot-test-harness)/vendor_ramdisk-test-harness.cpio$(RAMDISK_EXT) @@ -2688,8 +2677,8 @@ $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET): $(INTERNAL_VENDOR_RAMDISK_FRA $(call assert-max-image-size,$@,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE)) $(if $(BOARD_AVB_VENDOR_BOOT_KEY_PATH),$(call test-key-sign-vendor-bootimage,$@)) -endif # BUILDING_RAMDISK_IMAGE -endif # BUILDING_VENDOR_BOOT_IMAGE +endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE + # Creates a compatibility symlink between two partitions, e.g. /system/vendor to /vendor # $1: from location (e.g $(TARGET_OUT)/vendor) diff --git a/core/board_config.mk b/core/board_config.mk index 1b08f9a0b4..ea6ec1e4ec 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -439,6 +439,86 @@ else ifeq ($(PRODUCT_BUILD_RAMDISK_IMAGE),false) endif .KATI_READONLY := BUILDING_RAMDISK_IMAGE +# Are we building a debug vendor_boot image +BUILDING_DEBUG_VENDOR_BOOT_IMAGE := +# Can't build vendor_boot-debug.img if BOARD_BUILD_SYSTEM_ROOT_IMAGE is true, +# because building debug vendor_boot image requires a ramdisk. +ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) + ifeq ($(PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE is true, but so is BOARD_BUILD_SYSTEM_ROOT_IMAGE. \ + Skip building the debug vendor_boot image.) + endif +# Can't build vendor_boot-debug.img if we're not building a ramdisk. +else ifndef BUILDING_RAMDISK_IMAGE + ifeq ($(PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE is true, but we're not building a ramdisk image. \ + Skip building the debug vendor_boot image.) + endif +# Can't build vendor_boot-debug.img if we're not building a vendor_boot.img. +else ifndef BUILDING_VENDOR_BOOT_IMAGE + ifeq ($(PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE is true, but we're not building a vendor_boot image. \ + Skip building the debug vendor_boot image.) + endif +else + ifeq ($(PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE),) + BUILDING_DEBUG_VENDOR_BOOT_IMAGE := true + else ifeq ($(PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE),true) + BUILDING_DEBUG_VENDOR_BOOT_IMAGE := true + endif +endif +.KATI_READONLY := BUILDING_DEBUG_VENDOR_BOOT_IMAGE + +_has_boot_img_artifact := +ifneq ($(strip $(TARGET_NO_KERNEL)),true) + ifdef BUILDING_BOOT_IMAGE + _has_boot_img_artifact := true + endif + # BUILDING_RECOVERY_IMAGE && BOARD_USES_RECOVERY_AS_BOOT implies that + # recovery is being built with the file name *boot.img*, which still counts + # as "building boot.img". + ifdef BUILDING_RECOVERY_IMAGE + ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) + _has_boot_img_artifact := true + endif + endif +endif + +# Are we building a debug boot image +BUILDING_DEBUG_BOOT_IMAGE := +# Can't build boot-debug.img if BOARD_BUILD_SYSTEM_ROOT_IMAGE is true, +# because building debug boot image requires a ramdisk. +ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) + ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_BOOT_IMAGE is true, but so is BOARD_BUILD_SYSTEM_ROOT_IMAGE. \ + Skip building the debug boot image.) + endif +# Can't build boot-debug.img if we're not building a ramdisk. +else ifndef BUILDING_RAMDISK_IMAGE + ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_BOOT_IMAGE is true, but we're not building a ramdisk image. \ + Skip building the debug boot image.) + endif +# Can't build boot-debug.img if we're not building a boot.img. +else ifndef _has_boot_img_artifact + ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),true) + $(warning PRODUCT_BUILD_DEBUG_BOOT_IMAGE is true, but we're not building a boot image. \ + Skip building the debug boot image.) + endif +else + ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),) + BUILDING_DEBUG_BOOT_IMAGE := true + # Don't build boot-debug.img if we're already building vendor_boot-debug.img. + ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE + BUILDING_DEBUG_BOOT_IMAGE := + endif + else ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),true) + BUILDING_DEBUG_BOOT_IMAGE := true + endif +endif +.KATI_READONLY := BUILDING_DEBUG_BOOT_IMAGE +_has_boot_img_artifact := + # Are we building a userdata image BUILDING_USERDATA_IMAGE := ifeq ($(PRODUCT_BUILD_USERDATA_IMAGE),) diff --git a/core/product.mk b/core/product.mk index 015fe44ba9..db6c57779b 100644 --- a/core/product.mk +++ b/core/product.mk @@ -385,7 +385,9 @@ _product_single_value_vars += PRODUCT_BUILD_RAMDISK_IMAGE _product_single_value_vars += PRODUCT_BUILD_USERDATA_IMAGE _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE _product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE +_product_single_value_vars += PRODUCT_BUILD_DEBUG_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE +_product_single_value_vars += PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE _product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE From 6e701a2cac7e8f0c8cc458d375b7ce18ad5ba33b Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Thu, 14 Oct 2021 17:07:14 +0800 Subject: [PATCH 162/191] Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI We don't need these anymore as we now export userdebug_plat_sepolicy.cil to artifacts dist dir directly, so repack_bootimg don't need to use boot-(debug|with-debug-ramdisk)-*.img as repack source anymore. Bug: 202129499 Test: Check presubmit artifacts don't have boot-*debug*.img Change-Id: I3161e42b00a93177a1a4cb3b22da2218d294b7a7 Merged-In: I3161e42b00a93177a1a4cb3b22da2218d294b7a7 (cherry picked from commit 92f08702ddd42959508279eaf88071564bbc5b54) --- target/product/gsi_release.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 09417b5f1f..a2a29ed0fc 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -71,6 +71,8 @@ PRODUCT_EXTRA_VNDK_VERSIONS := \ # Do not build non-GSI partition images. PRODUCT_BUILD_CACHE_IMAGE := false +PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false +PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE := false PRODUCT_BUILD_USERDATA_IMAGE := false PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_BUILD_SUPER_PARTITION := false From 702b8fdfe00cfd34b6effe76fc71eeaef2cf4dd4 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 13 Oct 2021 17:39:33 +0800 Subject: [PATCH 163/191] sign_target_files_apks: adding --allow_gsi_debug_sepolicy https://android-review.googlesource.com/q/topic:gsi_debug_policy adds userdebug_plat_sepolicy.cil into the GSI system.img to reduce the steps of repacking a debug ramdisk. This CL checks that the file userdebug_plat_sepolicy.cil shouldn't exist before signing, unless the caller explicitly specifies --allow_gsi_debug_sepolicy to allow it. Note: also fixes the indentation around the block. Bug: 188067818 Bug: 201482141 Test: sign_target_files_apks *-target_files-*.zip signed.zip Change-Id: I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7 Merged-In: I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7 (cherry picked from commit 5a73b0ee976dc61fe6fa12e48f15d5ec53f90878) --- tools/releasetools/sign_target_files_apks.py | 23 ++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 0842af9018..936ef888dc 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -136,6 +136,11 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files --android_jar_path Path to the android.jar to repack the apex file. + + --allow_gsi_debug_sepolicy + Allow the existence of the file 'userdebug_plat_sepolicy.cil' under + (/system/system_ext|/system_ext)/etc/selinux. + If not set, error out when the file exists. """ from __future__ import print_function @@ -189,6 +194,7 @@ OPTIONS.gki_signing_key = None OPTIONS.gki_signing_algorithm = None OPTIONS.gki_signing_extra_args = None OPTIONS.android_jar_path = None +OPTIONS.allow_gsi_debug_sepolicy = False AVB_FOOTER_ARGS_BY_PARTITION = { @@ -658,7 +664,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, # Updates system_other.avbpubkey in /product/etc/. elif filename in ( "PRODUCT/etc/security/avb/system_other.avbpubkey", - "SYSTEM/product/etc/security/avb/system_other.avbpubkey"): + "SYSTEM/product/etc/security/avb/system_other.avbpubkey"): # Only update system_other's public key, if the corresponding signing # key is specified via --avb_system_other_key. signing_key = OPTIONS.avb_keys.get("system_other") @@ -671,9 +677,19 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, # Should NOT sign boot-debug.img. elif filename in ( "BOOT/RAMDISK/force_debuggable", - "BOOT/RAMDISK/first_stage_ramdisk/force_debuggable"): + "BOOT/RAMDISK/first_stage_ramdisk/force_debuggable"): raise common.ExternalError("debuggable boot.img cannot be signed") + # Should NOT sign userdebug sepolicy file. + elif filename in ( + "SYSTEM_EXT/etc/selinux/userdebug_plat_sepolicy.cil", + "SYSTEM/system_ext/etc/selinux/userdebug_plat_sepolicy.cil"): + if not OPTIONS.allow_gsi_debug_sepolicy: + raise common.ExternalError("debug sepolicy shouldn't be included") + else: + # Copy it verbatim if we allow the file to exist. + common.ZipWriteStr(output_tf_zip, out_info, data) + # A non-APK file; copy it verbatim. else: common.ZipWriteStr(output_tf_zip, out_info, data) @@ -1289,6 +1305,8 @@ def main(argv): OPTIONS.gki_signing_algorithm = a elif o == "--gki_signing_extra_args": OPTIONS.gki_signing_extra_args = a + elif o == "--allow_gsi_debug_sepolicy": + OPTIONS.allow_gsi_debug_sepolicy = True else: return False return True @@ -1339,6 +1357,7 @@ def main(argv): "gki_signing_key=", "gki_signing_algorithm=", "gki_signing_extra_args=", + "allow_gsi_debug_sepolicy", ], extra_option_handler=option_handler) From bef0d6d710bb31e8cabd9c8b22c5cbd7f926e13c Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 11 Feb 2021 07:37:55 +0000 Subject: [PATCH 164/191] Use prebuilts of the ART Module by default in SC branches. This means prebuilts located in /vendor/unbundled_google/modules/ArtGooglePrebuilt and /prebuilts/module_sdk/art are used instead of sources in /art, /libcore, and /libnativehelper. Sanitizer and coverage builds builds are excluded, as are builds using the products art_module_*, armv8, arm_krait, and others in device/generic/art. To keep using ART and libcore sources in local builds, set SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for further info. Cherry-picked from http://ag/15234812. Merged-in set to https://r.android.com/1801147 to avoid merging into master and *-plus-aosp branches, where we want to enable prebuilts separately. Test: build & boot on Cuttlefish Bug: 200554575 Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612 --- core/android_soong_config_vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 5e63a25d9c..c6f4d68df9 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -82,7 +82,7 @@ else # This sets the default for building ART APEXes from source rather than # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in # all other platform builds. - SOONG_CONFIG_art_module_source_build ?= true + SOONG_CONFIG_art_module_source_build ?= false endif # Apex build mode variables From 000ad3cf5a1d378d7cbc3431198733d3113db885 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 30 Nov 2021 00:19:13 +0000 Subject: [PATCH 165/191] Update Security String to 2022-01-05 Bug: 207022948 Change-Id: I972415a976bee96d1f93fb547bb5ae5323807516 Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 --- 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 211c7448a6..7c3c4d50e2 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -85,7 +85,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-12-05 + PLATFORM_SECURITY_PATCH := 2022-01-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 6e4c4dadb188ab193508dbc043f7ee8520705217 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Mon, 29 Nov 2021 23:51:49 +0000 Subject: [PATCH 166/191] [DO NOT MERGE] Update Security String to 2022-01-01 Bug: 207022948 Change-Id: Id0cffb66a65c60b011d0975ba6b0ff04366472d2 Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981 Merged-In: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b --- 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 4c83227778..a2c7837380 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-11-05 + PLATFORM_SECURITY_PATCH := 2022-01-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 932c1eb44ebb5c8ad4b97194f813c16d130e6896 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 6 Dec 2021 02:28:24 +0000 Subject: [PATCH 167/191] Version bump to SP2A.211206.002 [core/build_id.mk] Change-Id: I173567e332f73433067e1a764f35efdbe37183b6 --- 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 0f64340645..ab3038eca6 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=SP2A.211206.001 +BUILD_ID=SP2A.211206.002 From 435f1cf3900fc1dfc46fe0f80eb2dc6d9cd4572f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 8 Dec 2021 18:51:55 +0000 Subject: [PATCH 168/191] Version bump to SP2A.211208.002 [core/build_id.mk] Change-Id: Ia96ac83237d66a6f7da4d5cb5900a0c003d48861 --- 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 7bb83d4bf3..42b91eff76 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=SP2A.211208.001 +BUILD_ID=SP2A.211208.002 From 9e4ca8f63a13efec84cb5409fc513a98e87903f7 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 9 Dec 2021 03:17:58 +0000 Subject: [PATCH 169/191] Version bump to SP2A.211209.002 [core/build_id.mk] Change-Id: I0c359b741c08d79850dfc22a656e8f2e12e5331a --- 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 0aa427bfa5..6f96004cfe 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=SP2A.211209.001 +BUILD_ID=SP2A.211209.002 From fdbbcabca3d8c0ae12b91933ad52b5c84e044902 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 9 Dec 2021 19:40:23 +0000 Subject: [PATCH 170/191] [DO NOT MERGE] Update Security String to 2022-02-05 Bug: 210005927 Change-Id: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 --- 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 47bb92c142..4f89a2be78 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 := 2022-01-05 + PLATFORM_SECURITY_PATCH := 2022-02-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ba161e167ce5e5e86a101a1f5ed1638f42983b51 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 16 Dec 2021 01:50:45 +0000 Subject: [PATCH 171/191] Version bump to SP2A.211216.002 [core/build_id.mk] Change-Id: I8a60e07107a3e2e8f40f221b3b367ebc26a3849d --- 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 045b753cc8..e6229698ed 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=SP2A.211216.001 +BUILD_ID=SP2A.211216.002 From d9675cc22dce0ddbab7d9b634478bbb11ffc75e7 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Thu, 16 Dec 2021 18:36:30 +0000 Subject: [PATCH 172/191] Merge "Update vndk list with dice hal libraries." am: 06c7e31f01 am: 608be6d592 Original change: https://android-review.googlesource.com/c/platform/build/+/1906731 Change-Id: I984bc310a06e6c769270a3272fbac75d6aeae01b --- target/product/gsi/current.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index e57b4e3346..e61822650c 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -92,6 +92,7 @@ VNDK-core: android.hardware.radio.network-V1-ndk.so VNDK-core: android.hardware.radio.sim-V1-ndk.so VNDK-core: android.hardware.radio.voice-V1-ndk.so VNDK-core: android.hardware.rebootescrow-V1-ndk.so +VNDK-core: android.hardware.security.dice-V1-ndk.so VNDK-core: android.hardware.security.keymint-V1-ndk.so VNDK-core: android.hardware.security.secureclock-V1-ndk.so VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so From 1babda14631c6b24c21c146a61ea6ed458851237 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 16 Dec 2021 21:12:24 +0000 Subject: [PATCH 173/191] Update Security String to 2022-02-05 Bug: 210005927 Change-Id: I8b7a5dea105d34a7fa987ddb44e94d6f8c94c7cc Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 --- 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 40c506c75b..5cbc5af46c 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 := 2022-01-05 + PLATFORM_SECURITY_PATCH := 2022-02-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From dbca77790b2b21917362df1d2e74c54d52e3c01c Mon Sep 17 00:00:00 2001 From: Savitha Gouda Date: Fri, 17 Dec 2021 00:10:47 +0000 Subject: [PATCH 174/191] Update security string to 2022-02-01 Bug: 210005927 Change-Id: I573c92e95022c3f2b47e18646355208bda890386 Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 --- 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 21598c4732..7bcd42b023 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 := 2022-01-01 + PLATFORM_SECURITY_PATCH := 2022-02-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 4de07d2624a7f136157e22082be11f051afdb363 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 12 Oct 2021 16:50:21 +0900 Subject: [PATCH 175/191] Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND The config variable is used to force the generation of the AIDL ndk_platform backend which will eventually be removed in favor of the ndk backend. The switch is needed as an escape hatch for some devices whose BSP (outsourced and thus hardly modifiable) depends on the ndk_backend libraries. Bug: 161456198 Test: m Merged-In: Iba8633263ae649af783e94b01f5c1b5c6e042948 Change-Id: I8b73a6a1e5169c35daf333316857b3c3b110a0f7 --- core/soong_config.mk | 2 ++ target/product/gsi/Android.mk | 24 +++++++++++++++++++----- target/product/gsi/current.txt | 33 --------------------------------- 3 files changed, 21 insertions(+), 38 deletions(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index 073569d114..617abdf6c5 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -272,6 +272,8 @@ $(call add_json_bool, SepolicySplit, $(filter true,$(PRODUCT_SEPOLICY_SPLIT))) $(call add_json_list, SepolicyFreezeTestExtraDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_DIRS)) $(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_PREBUILT_DIRS)) +$(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_NDK_PLATFORM_BACKEND))) + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 39848e534a..0d788fad44 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -50,11 +50,21 @@ else _vndk_check_failure_message += " Run \`update-vndk-list.sh\` to update $(LATEST_VNDK_LIB_LIST)" endif +# The *-ndk_platform.so libraries no longer exist and are removed from the VNDK set. However, they +# can exist if NEED_AIDL_NDK_PLATFORM_BACKEND is set to true for legacy devices. Don't be bothered +# with the extraneous libraries. +ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true) + _READ_INTERNAL_VNDK_LIB_LIST := sed /ndk_platform.so/d $(INTERNAL_VNDK_LIB_LIST) +else + _READ_INTERNAL_VNDK_LIB_LIST := cat $(INTERNAL_VNDK_LIB_LIST) +endif + $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh - $(hide) ( diff --old-line-format="Removed %L" \ + $(hide) ($(_READ_INTERNAL_VNDK_LIB_LIST) | \ + diff --old-line-format="Removed %L" \ --new-line-format="Added %L" \ --unchanged-line-format="" \ - $(LATEST_VNDK_LIB_LIST) $(INTERNAL_VNDK_LIB_LIST) \ + $(LATEST_VNDK_LIB_LIST) - \ || ( echo -e $(_vndk_check_failure_message); exit 1 )) $(hide) mkdir -p $(dir $@) $(hide) touch $@ @@ -84,9 +94,13 @@ else echo " echo Run lunch or choosecombo first" >> $@; \ echo " exit 1" >> $@; \ echo "fi" >> $@; \ - echo "cd \$${ANDROID_BUILD_TOP}" >> $@; \ - echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@; \ - echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@ + echo "cd \$${ANDROID_BUILD_TOP}" >> $@ +ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true) + $(hide) echo "sed /ndk_platform.so/d $(PRIVATE_INTERNAL_VNDK_LIB_LIST) > $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@ +else + $(hide) echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@ +endif + $(hide) echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@ endif @chmod a+x $@ diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 37ac075201..e61822650c 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -19,11 +19,8 @@ LLNDK: libsync.so LLNDK: libvndksupport.so LLNDK: libvulkan.so VNDK-SP: android.hardware.common-V2-ndk.so -VNDK-SP: android.hardware.common-V2-ndk_platform.so VNDK-SP: android.hardware.common.fmq-V1-ndk.so -VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so VNDK-SP: android.hardware.graphics.common-V2-ndk.so -VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so VNDK-SP: android.hardware.graphics.common@1.0.so VNDK-SP: android.hardware.graphics.common@1.1.so VNDK-SP: android.hardware.graphics.common@1.2.so @@ -61,16 +58,13 @@ VNDK-SP: libutilscallstack.so VNDK-SP: libz.so VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.authsecret-V1-ndk.so -VNDK-core: android.hardware.authsecret-V1-ndk_platform.so VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so -VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so VNDK-core: android.hardware.configstore-utils.so VNDK-core: android.hardware.configstore@1.0.so VNDK-core: android.hardware.configstore@1.1.so VNDK-core: android.hardware.confirmationui-support-lib.so VNDK-core: android.hardware.dumpstate-V1-ndk.so VNDK-core: android.hardware.gnss-V1-ndk.so -VNDK-core: android.hardware.gnss-V1-ndk_platform.so VNDK-core: android.hardware.graphics.allocator@2.0.so VNDK-core: android.hardware.graphics.allocator@3.0.so VNDK-core: android.hardware.graphics.allocator@4.0.so @@ -78,67 +72,40 @@ VNDK-core: android.hardware.graphics.bufferqueue@1.0.so VNDK-core: android.hardware.graphics.bufferqueue@2.0.so VNDK-core: android.hardware.health-V1-ndk.so VNDK-core: android.hardware.health.storage-V1-ndk.so -VNDK-core: android.hardware.health.storage-V1-ndk_platform.so VNDK-core: android.hardware.identity-V3-ndk.so -VNDK-core: android.hardware.identity-V3-ndk_platform.so VNDK-core: android.hardware.keymaster-V3-ndk.so -VNDK-core: android.hardware.keymaster-V3-ndk_platform.so VNDK-core: android.hardware.light-V1-ndk.so -VNDK-core: android.hardware.light-V1-ndk_platform.so VNDK-core: android.hardware.media.bufferpool@2.0.so VNDK-core: android.hardware.media.omx@1.0.so VNDK-core: android.hardware.media@1.0.so VNDK-core: android.hardware.memtrack-V1-ndk.so -VNDK-core: android.hardware.memtrack-V1-ndk_platform.so VNDK-core: android.hardware.memtrack@1.0.so VNDK-core: android.hardware.oemlock-V1-ndk.so -VNDK-core: android.hardware.oemlock-V1-ndk_platform.so VNDK-core: android.hardware.power-V2-ndk.so -VNDK-core: android.hardware.power-V2-ndk_platform.so VNDK-core: android.hardware.power.stats-V1-ndk.so -VNDK-core: android.hardware.power.stats-V1-ndk_platform.so VNDK-core: android.hardware.radio-V1-ndk.so -VNDK-core: android.hardware.radio-V1-ndk_platform.so VNDK-core: android.hardware.radio.config-V1-ndk.so -VNDK-core: android.hardware.radio.config-V1-ndk_platform.so VNDK-core: android.hardware.radio.data-V1-ndk.so -VNDK-core: android.hardware.radio.data-V1-ndk_platform.so VNDK-core: android.hardware.radio.messaging-V1-ndk.so -VNDK-core: android.hardware.radio.messaging-V1-ndk_platform.so VNDK-core: android.hardware.radio.modem-V1-ndk.so -VNDK-core: android.hardware.radio.modem-V1-ndk_platform.so VNDK-core: android.hardware.radio.network-V1-ndk.so -VNDK-core: android.hardware.radio.network-V1-ndk_platform.so VNDK-core: android.hardware.radio.sim-V1-ndk.so -VNDK-core: android.hardware.radio.sim-V1-ndk_platform.so VNDK-core: android.hardware.radio.voice-V1-ndk.so -VNDK-core: android.hardware.radio.voice-V1-ndk_platform.so VNDK-core: android.hardware.rebootescrow-V1-ndk.so -VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so VNDK-core: android.hardware.security.dice-V1-ndk.so -VNDK-core: android.hardware.security.dice-V1-ndk_platform.so VNDK-core: android.hardware.security.keymint-V1-ndk.so -VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so VNDK-core: android.hardware.security.secureclock-V1-ndk.so -VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so -VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so VNDK-core: android.hardware.soundtrigger@2.0-core.so VNDK-core: android.hardware.soundtrigger@2.0.so VNDK-core: android.hardware.vibrator-V2-ndk.so -VNDK-core: android.hardware.vibrator-V2-ndk_platform.so VNDK-core: android.hardware.weaver-V1-ndk.so -VNDK-core: android.hardware.weaver-V1-ndk_platform.so VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so -VNDK-core: android.hardware.wifi.hostapd-V1-ndk_platform.so VNDK-core: android.hardware.wifi.supplicant-V1-ndk.so -VNDK-core: android.hardware.wifi.supplicant-V1-ndk_platform.so VNDK-core: android.hidl.token@1.0-utils.so VNDK-core: android.hidl.token@1.0.so VNDK-core: android.system.keystore2-V1-ndk.so -VNDK-core: android.system.keystore2-V1-ndk_platform.so VNDK-core: android.system.suspend-V1-ndk.so -VNDK-core: android.system.suspend-V1-ndk_platform.so VNDK-core: android.system.suspend@1.0.so VNDK-core: libaudioroute.so VNDK-core: libaudioutils.so From d8f5cca134d8fb838975d4ee2e8a2cb7a847b0cc Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Mon, 20 Dec 2021 14:55:30 +0000 Subject: [PATCH 176/191] Update Security String to 2022-02-05 Bug: 210005927 Change-Id: I89893ac32691d46c911c387d3f4c41f229cd33c0 --- 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 7c3c4d50e2..55182924a9 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -85,7 +85,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 := 2022-01-05 + PLATFORM_SECURITY_PATCH := 2022-02-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 16caffd2e7ad0af4417b13923592874a16b7d0f3 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 7 Jan 2022 00:50:13 +0000 Subject: [PATCH 177/191] Update Security String to 2022-03-05 Bug: 211820647 Change-Id: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 --- 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 5cbc5af46c..feb591451f 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 := 2022-02-05 + PLATFORM_SECURITY_PATCH := 2022-03-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 4169443230df8c76429c2e829bd7eda44ae3f7de Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 13 Jan 2022 01:10:01 +0000 Subject: [PATCH 178/191] Version bump to SP2A.220113.002 [core/build_id.mk] Change-Id: I0c591a48d31744fce90009fdae84ca4cec02559a --- 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 34bff80f5e..7400f51844 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=SP2A.220113.001 +BUILD_ID=SP2A.220113.002 From 219905477d28594ff32785453596b331aed3bf96 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 19 Jan 2022 00:40:03 +0000 Subject: [PATCH 179/191] Version bump to SP2A.220117.002 [core/build_id.mk] Change-Id: I899f56b2cd60aa1362f28bc0980d48664ab103f4 --- 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 f69e3ca044..710e35d05d 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=SP2A.220117.001 +BUILD_ID=SP2A.220117.002 From bc617799185d4f370f409594e0af45e6c0d2ef78 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 20 Jan 2022 00:47:21 +0000 Subject: [PATCH 180/191] Version bump to SP2A.220305.001 [core/build_id.mk] Change-Id: I591658d16ea0427cc84ad69da9ca3ee0643e4ac4 --- 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 710e35d05d..51a42d1a93 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=SP2A.220117.002 +BUILD_ID=SP2A.220305.001 From 8fce641d2b7b81bea6912350ff6306d45d36d1cf Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 21 Jan 2022 01:29:15 +0000 Subject: [PATCH 181/191] Version bump to SP2A.220305.002 [core/build_id.mk] Change-Id: I4e0e7c8c221424458beada1e9475d00929cc9b57 --- 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 51a42d1a93..4e120f9881 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=SP2A.220305.001 +BUILD_ID=SP2A.220305.002 From 15a5d7e90da4123c69266e534f1e2f308fe43010 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sun, 23 Jan 2022 20:57:17 +0000 Subject: [PATCH 182/191] Version bump to SP2A.220305.003 [core/build_id.mk] Change-Id: I15ffa11b423ba309d272a170e95c118797f98904 --- 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 4e120f9881..4f2c34c73c 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=SP2A.220305.002 +BUILD_ID=SP2A.220305.003 From f075c0caa0111dbfd80a0243cc567a29c1718808 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 25 Jan 2022 03:07:27 +0000 Subject: [PATCH 183/191] Version bump to SP2A.220305.004 [core/build_id.mk] Change-Id: Id8e1fa08843302f7ce4ddfcb61c7e05fd9ff9fb3 --- 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 4f2c34c73c..c3d5ff92e9 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=SP2A.220305.003 +BUILD_ID=SP2A.220305.004 From 15195de7149a2b0a19726845556b77808aa0610e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 26 Jan 2022 01:56:08 +0000 Subject: [PATCH 184/191] Version bump to SP2A.220305.005 [core/build_id.mk] Change-Id: I39676669c9be4709fd5fb4daf74479481ffadc7b --- 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 c3d5ff92e9..b5092fb053 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=SP2A.220305.004 +BUILD_ID=SP2A.220305.005 From 3af749508e6ca3a5b6026ba15fcf91629055d80f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 26 Jan 2022 21:40:09 +0000 Subject: [PATCH 185/191] Version bump to SP2A.220305.006 [core/build_id.mk] Change-Id: I152b5e87f0a87f177468b703325629beddb6a4b9 --- 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 b5092fb053..2a3257acea 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=SP2A.220305.005 +BUILD_ID=SP2A.220305.006 From c889a3e3487a407bc00035b7620295f152dd3c75 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Jan 2022 01:20:29 +0000 Subject: [PATCH 186/191] Version bump to SP2A.220305.007 [core/build_id.mk] Change-Id: I456a27e0792fa4aed2ec9510b6ec9739e3852ea6 --- 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 2a3257acea..3fefe17b6e 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=SP2A.220305.006 +BUILD_ID=SP2A.220305.007 From e9c2a744ec4fa6c3147f8dfeefc2617953c7761d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Jan 2022 03:23:49 +0000 Subject: [PATCH 187/191] Version bump to SP2A.220305.008 [core/build_id.mk] Change-Id: If15d37b5735278dc9427017625223b852d1bb9f7 --- 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 3fefe17b6e..49e7185819 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=SP2A.220305.007 +BUILD_ID=SP2A.220305.008 From a1bb55d28571082ed84861e5eb33913095201e32 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Jan 2022 22:51:10 +0000 Subject: [PATCH 188/191] Version bump to SP2A.220305.009 [core/build_id.mk] Change-Id: I84c41b3277cd136201b98859a7b9673dcc7bc4a3 --- 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 49e7185819..c122c88628 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=SP2A.220305.008 +BUILD_ID=SP2A.220305.009 From bbf902dd76d2e69582b8ddedaf62a1198b110a73 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 1 Feb 2022 00:44:03 +0000 Subject: [PATCH 189/191] Version bump to SP2A.220305.010 [core/build_id.mk] Change-Id: I743638439ef19bd7b2035c1ab649dd59cba4fffe --- 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 c122c88628..493efbf6f6 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=SP2A.220305.009 +BUILD_ID=SP2A.220305.010 From d43ab16bfa737f58835a1a8277b77d4b23ae9699 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 10 Feb 2022 00:42:29 +0000 Subject: [PATCH 190/191] Version bump to SP2A.220305.011 [core/build_id.mk] Change-Id: Iba5046b51ebd6fa0efdf0708e670c3a5d173c9df --- 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 493efbf6f6..45e3fcc181 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=SP2A.220305.010 +BUILD_ID=SP2A.220305.011 From 43eddfd0c92fb348b09fed5f75313aa3670ce8d0 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 12 Feb 2022 06:02:40 +0000 Subject: [PATCH 191/191] Version bump to SP2A.220305.012 [core/build_id.mk] Change-Id: I229423c7b64c715f6cd18534dba9e79d770152a1 --- 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 45e3fcc181..9ee361d226 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=SP2A.220305.011 +BUILD_ID=SP2A.220305.012