From 351b82aca871a8e69efa7d394ebeb3d6255ab2d2 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Thu, 22 Sep 2022 17:16:13 +0000 Subject: [PATCH 01/58] Add target_board_auto soong config variable It will be used to configure a compile time flag when building apexd for auto products. See the attached bug for more context Test: m Bug: 241473698 Change-Id: I7e7ce3216e455ff44b9a24fec14d6ee384e97192 --- core/android_soong_config_vars.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index bb622f0b9f..93c9c16867 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -121,6 +121,10 @@ endif $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) +ifdef TARGET_BOARD_AUTO + $(call add_soong_config_var_value, ANDROID, target_board_auto, $(TARGET_BOARD_AUTO)) +endif + # Ensure that those mainline modules who have individually toggleable prebuilts # are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by # default. From a12157186b0de7ef1077f527af1dbf842610c601 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 4 Oct 2022 18:44:47 +0000 Subject: [PATCH 02/58] Update Security String to 2022-12-05 Bug: 250644806 Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442 --- 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 0884e8591d..d93792128b 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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-11-05 + PLATFORM_SECURITY_PATCH := 2022-12-05 endif include $(BUILD_SYSTEM)/version_util.mk From 29b4ab90cbd39f0197929ce9c4c993ddaa7c45d3 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 4 Oct 2022 18:47:37 +0000 Subject: [PATCH 03/58] Update Security String to 2022-12-01 Bug: 250644806 Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442 Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442 --- 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 13d7d7a106..7cd0c586ec 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-11-01 + PLATFORM_SECURITY_PATCH := 2022-12-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From eef4b24433d447d5e0e04287dae62e1b2da22947 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 4 Oct 2022 18:57:28 +0000 Subject: [PATCH 04/58] Update Security String to 2022-12-01 Bug: 250644806 Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442 Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442 --- 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 0884e8591d..a0c4d75137 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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-11-05 + PLATFORM_SECURITY_PATCH := 2022-12-01 endif include $(BUILD_SYSTEM)/version_util.mk From 59b4f51bdd73ccaffdbbbdc1461e6355587c4e14 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Wed, 5 Oct 2022 02:20:58 +0000 Subject: [PATCH 05/58] Update Security String to 2022-12-01 Bug: 250644806 Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442 Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442 --- 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 5c8edc86cf..465d181613 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-11-01 + PLATFORM_SECURITY_PATCH := 2022-12-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From cd2b1b6239e5250e528751633fc8ad8a234c09f2 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 12 Oct 2022 21:42:05 +0000 Subject: [PATCH 06/58] Version bump to TQ2A.221012.002 [core/build_id.mk] Change-Id: I50fb7d87cbed550a2e5ed561425f6ea1eeb937de --- 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 2f3041a314..838b28ce53 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=TQ2A.221012.001 +BUILD_ID=TQ2A.221012.002 From 5c7b537dcdda2bbeb85344ca63e1d76f16395a27 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 13 Oct 2022 01:01:07 +0000 Subject: [PATCH 07/58] Version bump to TQ2A.221013.002 [core/build_id.mk] Change-Id: I1f82d04a7f191953cd9b200dc7ec0db9d113ede2 --- 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 4126c27b0f..d66c079e5c 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=TQ2A.221013.001 +BUILD_ID=TQ2A.221013.002 From 185751b379512d00cf66808f2997e408f3779dd5 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Thu, 20 Oct 2022 18:42:35 +0100 Subject: [PATCH 08/58] Add prng_seeder to base PRODUCT_PACKAGES. Cherry-pick / Dr No note: Should have been included with the previous prng_seeder CLs but we missed that it was needed due to testing on branches without prebuilts. Needs to be on all (for now) devices with libcrypto, i.e. all of them. I failed to learn from https://r.android.com/1305853 that adding something to Conscrypt's requirements doesn't work if the module is coming from a prebuilt... Again, the correct solution here would actually be to make libcrypto rather than Conscrypt require prng_seeder but Soong considers that a circular dependency Bug: 243933553 Test: m installclean && m and verify prng_seeder is installed and running. Change-Id: Ie34f8c693469eaeedae6a010b956d6c6513a6b15 Merged-In: Ie34f8c693469eaeedae6a010b956d6c6513a6b15 (cherry picked from commit 19b3361a020860edc9b3a39e36e229520675466c) --- target/product/base_system.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index de3217119a..b0870c32aa 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -238,6 +238,7 @@ PRODUCT_PACKAGES += \ pppd \ preinstalled-packages-platform.xml \ privapp-permissions-platform.xml \ + prng_seeder \ racoon \ recovery-persist \ resize2fs \ From 88f60539de43cfb56a9a50eba24ee2e29c10bd54 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 21 Oct 2022 22:28:13 +0000 Subject: [PATCH 09/58] Version bump to TQ2A.221021.002 [core/build_id.mk] Change-Id: I54813a9f897301a2d266c3eeaf53525f3fe44bd8 --- 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 2ddbe30719..bd71491e03 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=TQ2A.221021.001 +BUILD_ID=TQ2A.221021.002 From 9314e40b2815ea22acb9c9430a8c18f576980b05 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 26 Oct 2022 00:41:19 +0000 Subject: [PATCH 10/58] Version bump to TQ2A.221026.002 [core/build_id.mk] Change-Id: Ic6385f3b4b04c7e14297cb57557eb60a3cf088d7 --- 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 12c771409b..18daa5f364 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=TQ2A.221026.001 +BUILD_ID=TQ2A.221026.002 From 6646a5f11043523d25b2f7fca89cd0736651b91a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 27 Oct 2022 19:42:13 +0000 Subject: [PATCH 11/58] Version bump to TQ2A.221027.002 [core/build_id.mk] Change-Id: I752c3a0aa8aff2b8242bc438e695f1ad8b8211a9 --- 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 2865a54a2b..dc29710f4a 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=TQ2A.221027.001 +BUILD_ID=TQ2A.221027.002 From c14885fc05924154d247e1d3b76c4bc3b9e704f0 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Oct 2022 00:55:42 +0000 Subject: [PATCH 12/58] Version bump to TQ2A.221028.002 [core/build_id.mk] Change-Id: Ie74c8d464411d5ef03f02d4bce169c6c70f9015a --- 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 237ae8c632..6def0a9317 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=TQ2A.221028.001 +BUILD_ID=TQ2A.221028.002 From d50be230de8cd145b5e9a1a74f0cafa426491a8d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 31 Oct 2022 20:12:13 +0000 Subject: [PATCH 13/58] Version bump to TQ2A.221031.002 [core/build_id.mk] Change-Id: I37d39c9f7112d5d60f193bb275d8684fc70a73bd --- 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 87e653ffc9..84c6d57eb7 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=TQ2A.221031.001 +BUILD_ID=TQ2A.221031.002 From 16e28ba51e6053c2b8a61337b1f849350e34c3fc Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 3 Nov 2022 07:53:56 +0000 Subject: [PATCH 14/58] Version bump to TQ2A.221103.002 [core/build_id.mk] Change-Id: I598c92eebec95091ca45686cbc82444af70f621a --- 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 30a66af849..d9ca600509 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=TQ2A.221103.001 +BUILD_ID=TQ2A.221103.002 From cd9144cf3153df67d29b9b25ac51bdaff7d85966 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 3 Nov 2022 22:19:42 +0000 Subject: [PATCH 15/58] Version bump to TQ2A.221103.003 [core/build_id.mk] Change-Id: I24e746558c99be57841c23bf7a5a881cb12cc490 --- 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 d9ca600509..24ed405915 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=TQ2A.221103.002 +BUILD_ID=TQ2A.221103.003 From 96bed99d107d5ef054b3aa46b5d1b47a630efd74 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 4 Nov 2022 00:57:51 +0000 Subject: [PATCH 16/58] Version bump to TQ2A.221104.002 [core/build_id.mk] Change-Id: I536dfbe7a3402ddc7c271ae86b7e785b09e95712 --- 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 fd6949a487..6c4a13880b 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=TQ2A.221104.001 +BUILD_ID=TQ2A.221104.002 From 63befd4a6f4026183dc0d52e7ca6dc08f55c1022 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 4 Nov 2022 23:46:24 +0000 Subject: [PATCH 17/58] Version bump to TQ2A.221104.003 [core/build_id.mk] Change-Id: I6502894bce87dd461f2ff1ea2497d8a78a42aafb --- 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 6c4a13880b..04aee38930 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=TQ2A.221104.002 +BUILD_ID=TQ2A.221104.003 From 3a09e9e5acde88072b2d9ba36d819cc553cd7c05 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 7 Nov 2022 03:15:53 +0000 Subject: [PATCH 18/58] Version bump to TQ2A.221104.003.A1 [core/build_id.mk] Change-Id: I41cd92e55b9e5edf2ad6d86fe6eca89c0745e2fd --- 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 04aee38930..fedbb4d34b 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=TQ2A.221104.003 +BUILD_ID=TQ2A.221104.003.A1 From cbc9946992db9b58bce9059e8c88b00153463d5f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 7 Nov 2022 03:33:38 +0000 Subject: [PATCH 19/58] Version bump to TQ2A.221107.002 [core/build_id.mk] Change-Id: Ib2ee02ff2f91f9bdec8766d211900d2f84dd65da --- 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 f5aef12d60..46779c7ff1 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=TQ2A.221107.001 +BUILD_ID=TQ2A.221107.002 From acf1b3afe28f03a4816575960c9e903293a80d76 Mon Sep 17 00:00:00 2001 From: Hongguang Chen Date: Mon, 7 Nov 2022 13:36:38 -0800 Subject: [PATCH 20/58] Support chained init_boot partition signing Bug: 256048561 Bug: 256237041 Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \ SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \ xxx.zip signed.zip (Check signed.zip/META/misc_info.txt) Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029 (cherry picked from commit 0d6b727e03efd49a77e864077a01837e993f600f) Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029 --- tools/releasetools/sign_target_files_apks.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 6f96d8f6a6..837eaf9c1e 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -99,14 +99,14 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files The second dir will be used for lookup if BOARD_USES_RECOVERY_AS_BOOT is set to true. - --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system, - vbmeta_vendor}_algorithm - --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system, - vbmeta_vendor}_key + --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta, + vbmeta_system,vbmeta_vendor}_algorithm + --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta, + vbmeta_system,vbmeta_vendor}_key Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign the specified image. Otherwise it uses the existing values in info dict. - --avb_{apex,boot,recovery,system,system_other,vendor,dtbo,vbmeta, + --avb_{apex,init_boot,boot,recovery,system,system_other,vendor,dtbo,vbmeta, vbmeta_system,vbmeta_vendor}_extra_args Specify any additional args that are needed to AVB-sign the image (e.g. "--signing_helper /path/to/helper"). The args will be appended to @@ -1427,6 +1427,12 @@ def main(argv): OPTIONS.avb_algorithms['dtbo'] = a elif o == "--avb_dtbo_extra_args": OPTIONS.avb_extra_args['dtbo'] = a + elif o == "--avb_init_boot_key": + OPTIONS.avb_keys['init_boot'] = a + elif o == "--avb_init_boot_algorithm": + OPTIONS.avb_algorithms['init_boot'] = a + elif o == "--avb_init_boot_extra_args": + OPTIONS.avb_extra_args['init_boot'] = a elif o == "--avb_recovery_key": OPTIONS.avb_keys['recovery'] = a elif o == "--avb_recovery_algorithm": @@ -1518,6 +1524,9 @@ def main(argv): "avb_dtbo_algorithm=", "avb_dtbo_key=", "avb_dtbo_extra_args=", + "avb_init_boot_algorithm=", + "avb_init_boot_key=", + "avb_init_boot_extra_args=", "avb_recovery_algorithm=", "avb_recovery_key=", "avb_recovery_extra_args=", From 6e30aeea16681d7a2193e45eb55745c8cd194459 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 18:05:17 +0000 Subject: [PATCH 21/58] Update Security String to 2023-01-05 Bug: 258811679 Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 --- 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 d93792128b..864816c969 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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-12-05 + PLATFORM_SECURITY_PATCH := 2023-01-05 endif include $(BUILD_SYSTEM)/version_util.mk From 31bb5f4be2da789438a8377a4b653e63355c0422 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 11 Nov 2022 18:08:33 +0000 Subject: [PATCH 22/58] Update Security String to 2023-01-01 Bug: 258811679 Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 --- 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 7cd0c586ec..75754ef9b2 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-12-01 + PLATFORM_SECURITY_PATCH := 2023-01-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 26c214ebb80698fd65cb3b876d40f009773415ba Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 12 Nov 2022 01:19:29 +0000 Subject: [PATCH 23/58] Update Security String to 2023-01-01 Bug: 258811679 Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 --- 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 465d181613..de5f5bdc23 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-12-01 + PLATFORM_SECURITY_PATCH := 2023-01-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 04f7d51f7ad9e7b3f07443552c78967418337017 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 15 Nov 2022 07:36:40 +0000 Subject: [PATCH 24/58] Version bump to TQ2A.221111.001.A1 [core/build_id.mk] Change-Id: I4d79c115d491a8b1bf4f6c101f2f083df1403c55 --- 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 6297e27d2b..02ba332554 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=TQ2A.221111.001 +BUILD_ID=TQ2A.221111.001.A1 From 48740528032e817777688f0199a2719c0161df9c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 15 Nov 2022 08:11:39 +0000 Subject: [PATCH 25/58] Version bump to TQ2A.221111.001.A2 [core/build_id.mk] Change-Id: Icdca03b87342554add132d2c8290e33feab653d2 --- 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 02ba332554..98eb47cab1 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=TQ2A.221111.001.A1 +BUILD_ID=TQ2A.221111.001.A2 From 293d3adb03e597acc0e01eed1188c30bc1d3fbc6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 11 Nov 2022 13:10:22 +0000 Subject: [PATCH 26/58] Increase GF dynamic partition size to 8G Bug: 235574341 Bug: 258783815 Test: $ lunch sdk_phone64_x86_64-userdebug; m $ ls -l $OUT/super.img - check 8G $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt (cherry picked from commit bb8e6f5b12417ffdfcc4e3da8c4b9f5fe616fb2f) Merged-In: Ib08ee42e76a91b1c61c1b870f890dba66ed61209 Change-Id: I6c3ef94f9f08f42bd1edd01ff740d00c8d870e33 --- target/board/BoardConfigEmuCommon.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 845225da33..c0e8730e91 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -33,8 +33,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) # emulator needs super.img BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true - # 4G + 8M - BOARD_SUPER_PARTITION_SIZE := 4303355904 + # 8G + 8M + BOARD_SUPER_PARTITION_SIZE := 8598323200 BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true) @@ -56,8 +56,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) vendor endif - # 4G - BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 4294967296 + # 8G + BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592 # in build environment to speed up make -j ifeq ($(QEMU_DISABLE_AVB),true) From 425f7d1cb3fc5c1adc740db546c5b18227ea3c82 Mon Sep 17 00:00:00 2001 From: Hongguang Chen Date: Mon, 7 Nov 2022 13:36:38 -0800 Subject: [PATCH 27/58] Support chained init_boot partition signing Bug: 256048561 Bug: 256237041 Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \ SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \ xxx.zip signed.zip (Check signed.zip/META/misc_info.txt) Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029 (cherry picked from commit 0d6b727e03efd49a77e864077a01837e993f600f) Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029 (cherry picked from commit acf1b3afe28f03a4816575960c9e903293a80d76) --- tools/releasetools/sign_target_files_apks.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 6f96d8f6a6..837eaf9c1e 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -99,14 +99,14 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files The second dir will be used for lookup if BOARD_USES_RECOVERY_AS_BOOT is set to true. - --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system, - vbmeta_vendor}_algorithm - --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system, - vbmeta_vendor}_key + --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta, + vbmeta_system,vbmeta_vendor}_algorithm + --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta, + vbmeta_system,vbmeta_vendor}_key Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign the specified image. Otherwise it uses the existing values in info dict. - --avb_{apex,boot,recovery,system,system_other,vendor,dtbo,vbmeta, + --avb_{apex,init_boot,boot,recovery,system,system_other,vendor,dtbo,vbmeta, vbmeta_system,vbmeta_vendor}_extra_args Specify any additional args that are needed to AVB-sign the image (e.g. "--signing_helper /path/to/helper"). The args will be appended to @@ -1427,6 +1427,12 @@ def main(argv): OPTIONS.avb_algorithms['dtbo'] = a elif o == "--avb_dtbo_extra_args": OPTIONS.avb_extra_args['dtbo'] = a + elif o == "--avb_init_boot_key": + OPTIONS.avb_keys['init_boot'] = a + elif o == "--avb_init_boot_algorithm": + OPTIONS.avb_algorithms['init_boot'] = a + elif o == "--avb_init_boot_extra_args": + OPTIONS.avb_extra_args['init_boot'] = a elif o == "--avb_recovery_key": OPTIONS.avb_keys['recovery'] = a elif o == "--avb_recovery_algorithm": @@ -1518,6 +1524,9 @@ def main(argv): "avb_dtbo_algorithm=", "avb_dtbo_key=", "avb_dtbo_extra_args=", + "avb_init_boot_algorithm=", + "avb_init_boot_key=", + "avb_init_boot_extra_args=", "avb_recovery_algorithm=", "avb_recovery_key=", "avb_recovery_extra_args=", From 0e37facbae9398086fb4eace2117c67a7321dca2 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 15 Nov 2022 23:10:35 +0000 Subject: [PATCH 28/58] Version bump to TQ2A.221115.002 [core/build_id.mk] Change-Id: Ib4dfdb78ccb0b8b62f9a3be91628b92629c6cf45 --- 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 a35e1343c1..0e5bee7645 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=TQ2A.221115.001 +BUILD_ID=TQ2A.221115.002 From e2aaa4e4d464a5a74fd38b452c42a7bcec3aaed2 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 16 Nov 2022 01:43:59 +0000 Subject: [PATCH 29/58] Version bump to TQ2A.221116.002 [core/build_id.mk] Change-Id: If67298979b4b500f8bcd4d1fc18936f2e572ff82 --- 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 f1b909048b..09476e618a 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=TQ2A.221116.001 +BUILD_ID=TQ2A.221116.002 From 4c49df29abd44e3ca6e10c9e0084054a944b1357 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 17 Nov 2022 22:49:53 +0000 Subject: [PATCH 30/58] Version bump to TQ2A.221117.002 [core/build_id.mk] Change-Id: Ice7fb3b75812c5b9f0b08e84b822cd9c24fbfb28 --- 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 aab7155dd0..798ce0fe12 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=TQ2A.221117.001 +BUILD_ID=TQ2A.221117.002 From f2e03faaa7a2c76d84e5a0354bb6f93eb9ebef11 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 18 Nov 2022 01:17:52 +0000 Subject: [PATCH 31/58] Version bump to TQ2A.221118.002 [core/build_id.mk] Change-Id: I5e138adb4639690b327245c6644f62696ba1bc79 --- 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 36290a95fb..5c58f58151 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=TQ2A.221118.001 +BUILD_ID=TQ2A.221118.002 From 90a9395586f8a34461b51568c32bd94de6ffd05c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 18 Nov 2022 19:01:55 +0000 Subject: [PATCH 32/58] Version bump to TQ2A.221111.001.A3 [core/build_id.mk] Change-Id: I338129215a091d94d69c8bd75439aa119ed5a656 --- 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 98eb47cab1..06eda4918e 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=TQ2A.221111.001.A2 +BUILD_ID=TQ2A.221111.001.A3 From 4af7b8439bdee39fa7bb1f5dd6dd4e32309abb11 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 22 Nov 2022 02:43:57 +0000 Subject: [PATCH 33/58] Version bump to TQ2A.221118.002.A1 [core/build_id.mk] Change-Id: I6615a80807b1b383664df4b59ce1a9245b153531 --- 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 5c58f58151..ff75b3c264 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=TQ2A.221118.002 +BUILD_ID=TQ2A.221118.002.A1 From 8b5de36aadb3d8805f1eff16dfd399a7557e8015 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 29 Nov 2022 03:35:43 +0000 Subject: [PATCH 34/58] Version bump to TQ2A.221129.002 [core/build_id.mk] Change-Id: I03ec38347bceeb3721ba3924c194651b312097b1 --- 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 73c4191593..1de5a6683e 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=TQ2A.221129.001 +BUILD_ID=TQ2A.221129.002 From d473e5e3bc19fa3452ab42745511d030472c5029 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 29 Nov 2022 18:42:11 +0000 Subject: [PATCH 35/58] Version bump to TQ2A.221123.001.A1 [core/build_id.mk] Change-Id: I860cdebad45cbeea2c1a7d71192ce58114f32af1 --- 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 52e2d3534e..b8c79a418d 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=TQ2A.221123.001 +BUILD_ID=TQ2A.221123.001.A1 From 0df807eab60ea697ce40a98fd4d2fb07c686b07c Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 25 Oct 2022 03:00:27 +0000 Subject: [PATCH 36/58] Adding window_extensions.mk Adding window_extensions.mk to include all the necessary packages and properties. Bug: 235797785 Test: build and verified locally Change-Id: I79a4152c02d40d6686b98b14c264f3d52c7c4a2c --- target/product/window_extensions.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 target/product/window_extensions.mk diff --git a/target/product/window_extensions.mk b/target/product/window_extensions.mk new file mode 100644 index 0000000000..5f5431f677 --- /dev/null +++ b/target/product/window_extensions.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2022 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. +# + +# /system_ext packages +PRODUCT_PACKAGES += \ + androidx.window.extensions \ + androidx.window.sidecar + +# properties +PRODUCT_PRODUCT_PROPERTIES += \ + persist.wm.extensions.enabled=true From de657cf3f113e80711f187521815b9b27c5bb622 Mon Sep 17 00:00:00 2001 From: Marc Kassis Date: Thu, 1 Dec 2022 16:25:57 +0100 Subject: [PATCH 37/58] graphics.common V3 -> V4 Bug: 251177105 Test: m Change-Id: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598 Merged-In: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598 --- target/product/gsi/current.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 24005d9464..9908fb9646 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -21,7 +21,7 @@ LLNDK: libvndksupport.so LLNDK: libvulkan.so VNDK-SP: android.hardware.common-V2-ndk.so VNDK-SP: android.hardware.common.fmq-V1-ndk.so -VNDK-SP: android.hardware.graphics.common-V3-ndk.so +VNDK-SP: android.hardware.graphics.common-V4-ndk.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 From 79e595f4e3f7015c9911436d449ee7dd8fa87982 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Wed, 7 Dec 2022 19:17:20 +0000 Subject: [PATCH 38/58] Update Security String to 2023-02-05 Bug: 261738635 Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f --- 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 864816c969..339d36bb5c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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 := 2023-01-05 + PLATFORM_SECURITY_PATCH := 2023-02-05 endif include $(BUILD_SYSTEM)/version_util.mk From b601ce96db0d09cc2085495e2e0ec17e4a04b388 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Wed, 7 Dec 2022 19:21:38 +0000 Subject: [PATCH 39/58] Update Security String to 2023-02-01 Bug: 261738635 Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f --- 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 75754ef9b2..3da8fb1a9d 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 := 2023-01-01 + PLATFORM_SECURITY_PATCH := 2023-02-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From d0a709ffca1e54e4fdad728c962832c941e02afb Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 8 Dec 2022 18:37:43 +0000 Subject: [PATCH 40/58] Update Security String to 2023-02-01 Bug: 261738635 Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f --- 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 de5f5bdc23..75de1976ca 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 := 2023-01-01 + PLATFORM_SECURITY_PATCH := 2023-02-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 13fb9220ee461482ca0fc01d40bb57d613bf98da Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 12 Dec 2022 13:26:42 +0000 Subject: [PATCH 41/58] Version bump to TQ2A.221212.002 [core/build_id.mk] Change-Id: Ifd45d47d50b203e7497ab55002b88881eb9748e3 --- 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 a93cfd7bf1..602a5fc9d4 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=TQ2A.221212.001 +BUILD_ID=TQ2A.221212.002 From 4853157ef964696eb6ad7127521c91ed391bb058 Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 19 Dec 2022 16:51:15 +0100 Subject: [PATCH 42/58] Add SystemUI build flag for Compose code Bug: 242304109 Test: N/A Change-Id: Ib6e248b7af7031435a6f5398e6c8afef42459a57 --- core/android_soong_config_vars.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 575aa9acee..69b420f819 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -106,6 +106,10 @@ endif SYSTEMUI_OPTIMIZE_JAVA ?= true $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA) +# Disable Compose in SystemUI by default. +SYSTEMUI_USE_COMPOSE ?= false +$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE) + ifdef PRODUCT_AVF_ENABLED $(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED)) endif From 56f186c201bdf8d23cb366f9f2c9d07db905c40e Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 19 Dec 2022 15:51:54 +0100 Subject: [PATCH 43/58] Add SystemUI build flag for Compose code (3/3) Bug: 242304109 Test: Builds Change-Id: Ib6e248b7af7031435a6f5398e6c8afef42459a57 Merged-In: Ib6e248b7af7031435a6f5398e6c8afef42459a57 --- core/android_soong_config_vars.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 93c9c16867..aae17c306b 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -156,6 +156,10 @@ endif SYSTEMUI_OPTIMIZE_JAVA ?= true $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA) +# Disable Compose in SystemUI by default. +SYSTEMUI_USE_COMPOSE ?= false +$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE) + # Enable system_server optimizations by default unless explicitly set or if # there may be dependent runtime jars. # TODO(b/240588226): Remove the off-by-default exceptions after handling From 2c2af08b78a6823b476840aaf14250a178523d87 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 20 Dec 2022 00:00:43 +0000 Subject: [PATCH 44/58] Version bump to TQ2A.221219.002 [core/build_id.mk] Change-Id: Ia6c4fec09ccec52983455efcc5d69579e8bd08e9 --- 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 873b3c7e3d..23fcc184d6 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=TQ2A.221219.001 +BUILD_ID=TQ2A.221219.002 From df60f7cff94571c0c661ace865f01c997005299f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 20 Dec 2022 02:10:40 +0000 Subject: [PATCH 45/58] Version bump to TQ2A.221220.002 [core/build_id.mk] Change-Id: I4d681d793a9911898a4d6a0973a086d9c9591f3e --- 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 2777810113..d7c5f86f6b 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=TQ2A.221220.001 +BUILD_ID=TQ2A.221220.002 From 9d31b7ce87be32b4ce09bdcacb8158a46cc1598d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 21 Dec 2022 19:12:49 +0000 Subject: [PATCH 46/58] Version bump to TQ2A.221216.001.A1 [core/build_id.mk] Change-Id: Ibf056c0ec9ef3a0e31f4335102fd9905b15d1f85 --- 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 839fc72953..5b089b6bb1 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=TQ2A.221216.001 +BUILD_ID=TQ2A.221216.001.A1 From b7d70a2cb114ecbe9c931d59d852f5ada771ab52 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 22 Dec 2022 10:30:00 -0800 Subject: [PATCH 47/58] Fix VB 1.0 failure due to openssl output format change Openssl changed output format, the 'keyid:' prefix is removed, hence old regex is unable to extract key id. Bug: 262902909 Change-Id: Iea5b6fffed7c27855d87e35292f07a56686e4197 Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6 --- tools/releasetools/sign_target_files_apks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 837eaf9c1e..09d0b10a42 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -1032,7 +1032,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path): keyid, stderr = p.communicate() assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr) keyid = re.search( - r'keyid:([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() + r'Authority Key Identifier:\s*(?:keyid:)?([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() print("Replacing verity keyid with {}".format(keyid)) out_buffer.append("veritykeyid=id:%s" % (keyid,)) From 9f0379bd60749b375865bd5875cd1c4e52742922 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 22 Dec 2022 10:30:00 -0800 Subject: [PATCH 48/58] Fix VB 1.0 failure due to openssl output format change Openssl changed output format, the 'keyid:' prefix is removed, hence old regex is unable to extract key id. Bug: 262902909 Change-Id: Iea5b6fffed7c27855d87e35292f07a56686e4197 Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6 Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197 (cherry picked from commit b7d70a2cb114ecbe9c931d59d852f5ada771ab52) --- tools/releasetools/sign_target_files_apks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 837eaf9c1e..09d0b10a42 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -1032,7 +1032,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path): keyid, stderr = p.communicate() assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr) keyid = re.search( - r'keyid:([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() + r'Authority Key Identifier:\s*(?:keyid:)?([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() print("Replacing verity keyid with {}".format(keyid)) out_buffer.append("veritykeyid=id:%s" % (keyid,)) From 686a6957d52a9b77aae8c150dbe61261ee505d2c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 11 Jan 2023 20:52:20 +0000 Subject: [PATCH 49/58] Version bump to TQ2A.230109.002 [core/build_id.mk] Change-Id: Ief26fe17debe7e51ad095d1783733a55ca858015 --- 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 168140646f..93d6488ddc 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=TQ2A.230109.001 +BUILD_ID=TQ2A.230109.002 From c6a1548da94c7fbc252d949a2a8035b67662e434 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 13 Jan 2023 03:02:57 +0000 Subject: [PATCH 50/58] Version bump to TQ2A.230109.003 [core/build_id.mk] Change-Id: I97a46c5295638f06ef9001d0021b6ad3287eaca7 --- 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 93d6488ddc..f49f2512fb 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=TQ2A.230109.002 +BUILD_ID=TQ2A.230109.003 From d7834084dd023d0bd6489415e0e14be410accc02 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 13 Jan 2023 18:17:59 +0000 Subject: [PATCH 51/58] Update Security String to 2023-03-05 Bug: 265319238 Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb (cherry picked from commit 465700df394ccbfa6c1f38c3fab84d54ca02e027) Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb --- 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 339d36bb5c..208e1e6bd5 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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 := 2023-02-05 + PLATFORM_SECURITY_PATCH := 2023-03-05 endif include $(BUILD_SYSTEM)/version_util.mk From f966be777304748563ef3d746d4837074796ac15 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 20 Jan 2023 00:42:35 +0000 Subject: [PATCH 52/58] Version bump to TQ2A.230305.002 [core/build_id.mk] Change-Id: I8ec25a672e24ed7098572fb063b9463a850e8ef3 --- 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 43ab9d96ab..0bcf8defce 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=TQ2A.230305.001 +BUILD_ID=TQ2A.230305.002 From e273869df5424d64cc8d9c7f69fa586ad59ff8c7 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 24 Jan 2023 01:32:09 +0000 Subject: [PATCH 53/58] Version bump to TQ2A.230305.003 [core/build_id.mk] Change-Id: I250dd2cde623479cef4cb773ed3e578f18136c99 --- 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 0bcf8defce..b4cd5ea92a 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=TQ2A.230305.002 +BUILD_ID=TQ2A.230305.003 From fa6e951a7d0315844a1ce75d236e3fa4ea11f33a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 27 Jan 2023 18:39:41 +0000 Subject: [PATCH 54/58] Version bump to TQ2A.230305.004 [core/build_id.mk] Change-Id: I17ee94c0986c461684e7f987552878bd05876912 --- 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 b4cd5ea92a..cf6e2850c1 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=TQ2A.230305.003 +BUILD_ID=TQ2A.230305.004 From 4e953c95a153e4f5c680ca24d308e419241e14ea Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 28 Jan 2023 02:57:30 +0000 Subject: [PATCH 55/58] Version bump to TQ2A.230305.005 [core/build_id.mk] Change-Id: I3236c2fbd10722113998510857e94c0ce0e28e08 --- 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 cf6e2850c1..ea25c38147 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=TQ2A.230305.004 +BUILD_ID=TQ2A.230305.005 From d4baf72ab6155f7f0c98075ae0eab464ab7b952b Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 2 Feb 2023 21:52:28 +0000 Subject: [PATCH 56/58] Version bump to TQ2A.230305.006 [core/build_id.mk] Change-Id: Ie60b11a927007ad9571eda1f6b094fb68d275d81 --- 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 ea25c38147..09a495ed8a 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=TQ2A.230305.005 +BUILD_ID=TQ2A.230305.006 From f159d350f6be77a3a82f7e743b761ded294ab7e9 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 4 Feb 2023 03:50:17 +0000 Subject: [PATCH 57/58] Version bump to TQ2A.230305.007 [core/build_id.mk] Change-Id: Iec89798bdc3314925f92cc0e47d31ce32b11adb8 --- 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 09a495ed8a..2fb0f66245 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=TQ2A.230305.006 +BUILD_ID=TQ2A.230305.007 From 5ca47f57b1e81b1ad8a6a75bd10a1bfc6e05c517 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 11 Feb 2023 17:28:29 +0000 Subject: [PATCH 58/58] Version bump to TQ2A.230305.008 [core/build_id.mk] Change-Id: I20a857714f506097c06cf8168b7ec368a3117612 --- 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 2fb0f66245..f2c871c692 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=TQ2A.230305.007 +BUILD_ID=TQ2A.230305.008