From 389f21950cde4e5263fbf675eced0c940132ae4e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 7 Jan 2022 01:40:44 +0000 Subject: [PATCH 01/19] Update security string to 2022-03-01 Bug: 211820647 Change-Id: I9afb39715b0e470866a344246566e6414071ae6a Merged-In: 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 7bcd42b02..0661e7f9a 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-02-01 + PLATFORM_SECURITY_PATCH := 2022-03-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 8eac089eef2599353331cbf83e9170cb44d8e01e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sun, 30 Jan 2022 04:23:40 +0000 Subject: [PATCH 02/19] Update Security String to 2022-04-01 Bug: 216579780 Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 Merged-In: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 --- 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 3511d6378..4b3a78c81 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,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-03-01 + PLATFORM_SECURITY_PATCH := 2022-04-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 5ff4380b5df300a0e0f0a57f8bf079dc11759498 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 27 Jan 2022 18:15:53 -0800 Subject: [PATCH 03/19] Add a keys argument to tapas Add a keys argument to tapas that allows specifying devkeys to use internal aosp_devkeys_* products that use the internal devkeys, which will allow building unbundled apps that use platform keys for testing. Bug: 216553104 Test: tapas CarMediaApp devkeys Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093 Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093 --- envsetup.sh | 12 +++++++++++- tapasHelp.sh | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 8a995c7fd..a8b224d55 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -746,7 +746,9 @@ function tapas() local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|arm64|x86_64)$' | xargs)" local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)" local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" - local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" + local keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)" + local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi|devkeys)$' | xargs)" + if [ "$showHelp" != "" ]; then $(gettop)/build/make/tapasHelp.sh @@ -765,6 +767,10 @@ function tapas() echo "tapas: Error: Multiple densities supplied: $density" return fi + if [ $(echo $keys | wc -w) -gt 1 ]; then + echo "tapas: Error: Multiple keys supplied: $keys" + return + fi local product=aosp_arm case $arch in @@ -772,6 +778,10 @@ function tapas() arm64) product=aosp_arm64;; x86_64) product=aosp_x86_64;; esac + if [ -n "$keys" ]; then + product=${product/aosp_/aosp_${keys}_} + fi; + if [ -z "$variant" ]; then variant=eng fi diff --git a/tapasHelp.sh b/tapasHelp.sh index 0f461304a..7cb5f2c0f 100755 --- a/tapasHelp.sh +++ b/tapasHelp.sh @@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}" cd ../.. TOP="${PWD}" -message='usage: tapas [ ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] +message='usage: tapas [ ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] [devkeys] tapas selects individual apps to be built by the Android build system. Unlike "lunch", "tapas" does not request the building of images for a device. From 41a3269dd643f8469497fffdcf6d6bfcd738df0e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sun, 30 Jan 2022 04:20:11 +0000 Subject: [PATCH 04/19] Update Security String to 2022-04-05 Bug: 216579780 Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 --- 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 feb591451..16ad06214 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-03-05 + PLATFORM_SECURITY_PATCH := 2022-04-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ca9ac3da0aab3507512688c70b354ceacb88f783 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 8 Mar 2022 00:40:46 +0000 Subject: [PATCH 05/19] Version bump to SQ3A.220308.002 [core/build_id.mk] Change-Id: I302c49f5b4504201ed3a839e2f056c1548c66fd7 --- 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 92d2036d0..2c9183976 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=SQ3A.220308.001 +BUILD_ID=SQ3A.220308.002 From 8f3602319f14f9b4d23ed4494700e43ee736e54b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 14 Mar 2022 18:02:35 +0000 Subject: [PATCH 06/19] Update Security String to 2022-05-01 Bug: 223313197 Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267 Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267 --- 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 4b3a78c81..6b12e1270 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,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-04-01 + PLATFORM_SECURITY_PATCH := 2022-05-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 825ae0009229c3387c5ea24b8267a29b5522fb8a Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 21:36:57 +0000 Subject: [PATCH 07/19] Update Security String to 2022-05-05 Bug: 223313197 Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267 --- 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 16ad06214..a0897449c 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-04-05 + PLATFORM_SECURITY_PATCH := 2022-05-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ec16255c9b86e3b833e8102c9d791923dacccdd3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 16 Mar 2022 08:42:43 +0000 Subject: [PATCH 08/19] Version bump to SQ3A.220316.002 [core/build_id.mk] Change-Id: Ie21be1e6cbd18e4acca740d965d5b24923583f4d --- 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 14edbf977..decdaf190 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=SQ3A.220316.001 +BUILD_ID=SQ3A.220316.002 From b029beaab95804393d209f3edf093a44713ab82c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 1 Apr 2022 18:58:37 +0000 Subject: [PATCH 09/19] Version bump to SQ3A.220401.002 [core/build_id.mk] Change-Id: I7f8cee6758121579f3f5233c66d7f51d24a854d4 --- 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 6beca4665..2a717bade 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=SQ3A.220401.001 +BUILD_ID=SQ3A.220401.002 From e71eb9afd5fd6eeead656a3a917a81e0a9769b86 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Wed, 6 Apr 2022 05:02:37 +0000 Subject: [PATCH 10/19] Update Security String to 2022-06-05 Bug: 228265025 Change-Id: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c (cherry picked from commit ee052ac0e5922c5a9672cfcfcae4a6945eff30c9) Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c --- 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 a0897449c..0daae6bdc 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-05-05 + PLATFORM_SECURITY_PATCH := 2022-06-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ff65f276bb6d82a3a039f37949e264451aa12bd8 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 12 Apr 2022 17:37:23 +0000 Subject: [PATCH 11/19] Version bump to SQ3A.220605.002 [core/build_id.mk] Change-Id: Iacae8bd95aae30c039556a2432fed72fd823c488 --- 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 5e9ab7dc8..2cbffb76d 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=SQ3A.220605.001 +BUILD_ID=SQ3A.220605.002 From 2387029398cb6ccab74b3e4ed1bb759de84111bb Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 16 Apr 2022 00:31:01 +0000 Subject: [PATCH 12/19] Version bump to SQ3A.220605.003 [core/build_id.mk] Change-Id: If9889998af265cb656558ad3724fe68e92882d5d --- 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 2cbffb76d..05e97c43c 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=SQ3A.220605.002 +BUILD_ID=SQ3A.220605.003 From b3fca2e6924abeab0bbfc7e23908d3d62b2d94ac Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 20 Apr 2022 19:01:27 +0000 Subject: [PATCH 13/19] Version bump to SQ3A.220605.004 [core/build_id.mk] Change-Id: Idfe0d95785fbd3b9c3f3b9d420fa77c72f237128 --- 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 05e97c43c..e6637721b 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=SQ3A.220605.003 +BUILD_ID=SQ3A.220605.004 From dedb27a04b9c6d08e189675f60a973d85d91bc62 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 22 Apr 2022 21:07:35 +0000 Subject: [PATCH 14/19] Version bump to SQ3A.220605.005 [core/build_id.mk] Change-Id: Iac14da8e2857b26adeee985d115f72ea8e836a57 --- 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 e6637721b..5d0d21609 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=SQ3A.220605.004 +BUILD_ID=SQ3A.220605.005 From 84d14fec83f4d4ae2daa68ae24a5a4574c9d2129 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 27 Apr 2022 17:53:03 +0000 Subject: [PATCH 15/19] Version bump to SQ3A.220605.006 [core/build_id.mk] Change-Id: I404c064afd6c51c16c1060f4fdb71a019c30972d --- 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 5d0d21609..c1bdf6361 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=SQ3A.220605.005 +BUILD_ID=SQ3A.220605.006 From cace3edbeb2f9410510b12c08bd58b4082e7dad1 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 30 Apr 2022 01:25:42 +0000 Subject: [PATCH 16/19] Version bump to SQ3A.220605.007 [core/build_id.mk] Change-Id: I5ce47894800561f4786c47440ce0744375285acf --- 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 c1bdf6361..3b33bf0b2 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=SQ3A.220605.006 +BUILD_ID=SQ3A.220605.007 From af4256c1a80a37e13dbdfa76c2ab3bbbb2231c7e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 6 May 2022 18:47:16 +0000 Subject: [PATCH 17/19] Version bump to SQ3A.220605.008 [core/build_id.mk] Change-Id: Id449fd8f20d723b45e20f93810b95ed437c84c8f --- 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 3b33bf0b2..a009a6ed0 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=SQ3A.220605.007 +BUILD_ID=SQ3A.220605.008 From 1f6930364b40104c9a7eaba24ea3cfb92c5545af Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 9 May 2022 23:50:01 +0000 Subject: [PATCH 18/19] Version bump to SQ3A.220605.009 [core/build_id.mk] Change-Id: I9c038f563e6798cf18dffd83fc505a4dbb5ca443 --- 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 a009a6ed0..8f45238bb 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=SQ3A.220605.008 +BUILD_ID=SQ3A.220605.009 From 6aee89135298d9f9627790321c7c7970114ff81e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 26 May 2022 22:09:28 +0000 Subject: [PATCH 19/19] Version bump to SQ3A.220605.009.B1 [core/build_id.mk] Change-Id: I64e45571280941e94a7ce23d4aa9908881f7db74 --- 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 8f45238bb..a0ef324bc 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=SQ3A.220605.009 +BUILD_ID=SQ3A.220605.009.B1