From a7e7e0bbf59b51aa9358bf5cef903026ad056a01 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 22 Dec 2022 10:30:00 -0800 Subject: [PATCH 01/69] 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: Iea5b6fffed7c27855d87e35292f07a56686e4197 Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6 (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 47360c9464..6b83a22f9f 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -924,7 +924,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 465700df394ccbfa6c1f38c3fab84d54ca02e027 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 13 Jan 2023 18:17:59 +0000 Subject: [PATCH 02/69] Update Security String to 2023-03-05 Bug: 265319238 Change-Id: 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 4904a802474098e945235571a0a7eb7b9707bf38 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 13 Jan 2023 18:20:12 +0000 Subject: [PATCH 03/69] Update Security String to 2023-03-01 Bug: 265319238 Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb 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 75de1976ca..7493f7f3bc 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-02-01 + PLATFORM_SECURITY_PATCH := 2023-03-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 663e449fbfdc939057005bdc835c5dd08dd15ee7 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 13 Jan 2023 18:22:27 +0000 Subject: [PATCH 04/69] Update Security String to 2023-03-01 Bug: 265319238 Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb 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 5537b6727e..70371e8a33 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-02-01 + PLATFORM_SECURITY_PATCH := 2023-03-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 360fb8326599ff033558d2d8d5ad079195edee25 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 13 Jan 2023 21:39:32 +0000 Subject: [PATCH 05/69] Version bump to TQ3A.230113.002 [core/build_id.mk] Change-Id: I98829e7e69b713d951396b73515e8a2bbae3384d --- 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 9b088cd19c..54ea440857 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=TQ3A.230113.001 +BUILD_ID=TQ3A.230113.002 From 322f151daec03d80433c1b5d8eca8d8379c52be9 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 17 Jan 2023 20:13:33 +0000 Subject: [PATCH 06/69] Version bump to TQ3A.230117.002 [core/build_id.mk] Change-Id: Id03d5fc2cfb158b20de40cd0ef824fd8f03ce348 --- 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 58424d0583..d5fc633c7d 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=TQ3A.230117.001 +BUILD_ID=TQ3A.230117.002 From 3c1caa29b8cdbbb91858ecb236f40ebf042b403d Mon Sep 17 00:00:00 2001 From: Duy Truong Date: Wed, 11 Jan 2023 18:21:53 -0800 Subject: [PATCH 07/69] Include JDK with STS SDK like the other *TS suites. Bug: 238373261 Test: Build and run STS SDK sample Change-Id: I7378a555393e4194917083197829201320e595b4 --- core/tasks/sts-lite.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk index dee25d4802..65c65c3dc6 100644 --- a/core/tasks/sts-lite.mk +++ b/core/tasks/sts-lite.mk @@ -29,7 +29,8 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) $(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \ -x android-sts-lite/tools/sts-tradefed-tests.jar \ 'android-sts-lite/tools/*:sts-test/libs/' \ - 'android-sts-lite/testcases/*:sts-test/utils/' + 'android-sts-lite/testcases/*:sts-test/utils/' \ + 'android-sts-lite/jdk/**/*:sts-test/jdk/' $(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES) rm -f $(STS_LITE_ZIP)_filtered From 5565fbd76e4ec20feba16b0c51bdaae85e74e359 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 20 Apr 2022 21:36:44 +0000 Subject: [PATCH 08/69] Add owners for version_defaults.mk Adding members of the RelPgM team to fast track monthly Security SPL update approval Bug: 219813826 Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b (cherry picked from commit 5dc6b582bec256f9b19ea748f3013e53ad3a4f77) Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b --- core/OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/OWNERS b/core/OWNERS index 8794434f7b..8d612e02d5 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -2,5 +2,5 @@ per-file dex_preopt*.mk = ngeoffray@google.com,calin@google.com,mathewi@google.c per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,skvadrik@google.com # For version updates -per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com +per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,jainne@google.com From 34ec5ba13e101aa8987853c02805336b2b2d884c Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 20 Apr 2022 21:36:44 +0000 Subject: [PATCH 09/69] Add owners for version_defaults.mk Adding members of the RelPgM team to fast track monthly Security SPL update approval Bug: 219813826 Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b (cherry picked from commit 5dc6b582bec256f9b19ea748f3013e53ad3a4f77) Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b --- core/OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/OWNERS b/core/OWNERS index 5456d4f064..0592a8e1c5 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -2,5 +2,5 @@ per-file dex_preopt*.mk = ngeoffray@google.com,calin@google.com,mathewi@google.c per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,mathieuc@google.com # For version updates -per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com +per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,jainne@google.com From 7440043e3c15642e8dc2152597c6a5a266033de3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 30 Jan 2023 20:01:57 +0000 Subject: [PATCH 10/69] Version bump to TQ3A.230130.002 [core/build_id.mk] Change-Id: I59000da84fd37d13c7c22d73b4d6002c6bc33a5f --- 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 0bad8c1752..a2820dc760 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=TQ3A.230130.001 +BUILD_ID=TQ3A.230130.002 From 36a6826611ea5d5b73e5cee0a4a6b21961f2c4fa Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 2 Feb 2023 19:27:41 +0000 Subject: [PATCH 11/69] Version bump to TQ3A.230127.001.A1 [core/build_id.mk] Change-Id: Ica6c47566acc74952bfc3beef929317a721e2b7b --- 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 d7d39e75dc..d64e27417b 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=TQ3A.230127.001 +BUILD_ID=TQ3A.230127.001.A1 From a03f1265fba2756ae0d134cd7833ac7a32b8f8ea Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 1 Feb 2023 12:12:51 +0000 Subject: [PATCH 12/69] Support SHA minSdkVersion in APK in APEX Bug: 266903788 Test: rm -fr out/dist UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true TARGET_BUILD_APPS="com.google.android.rkpd" vendor/google/build/mainline_modules_bundles.sh # Without this change it fails, with this change it passes at # which point run the following. mkdir contents cd contents unzip ../out/dist/dev_keys_signed/com.google.android.rkpd/com.google.android.rkpd.apks deapexer extract standalones/standalone-x86.apex apex-contents aapt2 dump badging apex-contents/priv-app/rkpdapp.google@*/rkpdapp.google.apk | grep Version # The sdkVersion and targetSdkVersion should both be set to SHA # versions. Change-Id: I9ca54affd30f0a6cf561f1274b991d39e7cf1bce (cherry picked from commit 730d0c437a879bd23c80f82566bab8f8db2418ee) Merged-In: I9ca54affd30f0a6cf561f1274b991d39e7cf1bce --- tools/releasetools/common.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 418d8daa85..ec49b0d36f 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -2309,12 +2309,22 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map): try: return int(version) except ValueError: - # Not a decimal number. Codename? - if version in codename_to_api_level_map: - return codename_to_api_level_map[version] + # Not a decimal number. + # + # It could be either a straight codename, e.g. + # UpsideDownCake + # + # Or a codename with API fingerprint SHA, e.g. + # UpsideDownCake.e7d3947f14eb9dc4fec25ff6c5f8563e + # + # Extract the codename and try and map it to a version number. + split = version.split(".") + codename = split[0] + if codename in codename_to_api_level_map: + return codename_to_api_level_map[codename] raise ExternalError( - "Unknown minSdkVersion: '{}'. Known codenames: {}".format( - version, codename_to_api_level_map)) + "Unknown codename: '{}' from minSdkVersion: '{}'. Known codenames: {}".format( + codename, version, codename_to_api_level_map)) def SignFile(input_name, output_name, key, password, min_api_level=None, From c29c047fd16a42155da018f1eb7d5be49ee5cbf8 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 10 Feb 2023 03:21:01 +0000 Subject: [PATCH 13/69] Update Security String to 2023-04-05 Bug: 268558932 Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 --- 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 208e1e6bd5..38d05107d9 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-03-05 + PLATFORM_SECURITY_PATCH := 2023-04-05 endif include $(BUILD_SYSTEM)/version_util.mk From baf6b726c429ad90b2785e061e710cf5cee0d2b2 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 10 Feb 2023 03:23:54 +0000 Subject: [PATCH 14/69] Update Security String to 2023-04-01 Bug: 268558932 Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 --- 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 7493f7f3bc..8806df6120 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-03-01 + PLATFORM_SECURITY_PATCH := 2023-04-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 641c8e9c6b6fe864da23fc08c10420349e715a13 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 10 Feb 2023 03:26:13 +0000 Subject: [PATCH 15/69] Update Security String to 2023-04-01 Bug: 268558932 Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 --- 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 70371e8a33..73ff4f56ec 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-03-01 + PLATFORM_SECURITY_PATCH := 2023-04-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From d1c9cf5548511664835632552ee962aa8a4ee734 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 13 Feb 2023 19:35:07 +0000 Subject: [PATCH 16/69] Version bump to TQ3A.230213.002 [core/build_id.mk] Change-Id: Iff8059e28bef5375345df4ef207c219ed8eacbc9 --- 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 dd214e1cfe..bda234ffe3 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=TQ3A.230213.001 +BUILD_ID=TQ3A.230213.002 From 14d4b7c6b1c400306c3e86fc1e18b3f17130e4ea Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 15 Feb 2023 20:00:21 +0000 Subject: [PATCH 17/69] Version bump to TQ3A.230215.002 [core/build_id.mk] Change-Id: Ieeda8bdece0a9e592b42429c16119256aa45d56f --- 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 edc6a22009..4680a69890 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=TQ3A.230215.001 +BUILD_ID=TQ3A.230215.002 From d0446f59ca87c03f0feab014d6c6e4f33577f707 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 16 Feb 2023 01:58:24 +0000 Subject: [PATCH 18/69] Version bump to TQ3A.230216.002 [core/build_id.mk] Change-Id: I3c0fa83eb057c8b106ac56bab3dc66aaf67f4811 --- 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 36151f71b5..e6a47c1fbb 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=TQ3A.230216.001 +BUILD_ID=TQ3A.230216.002 From fb1bdc2a91097ac3e5b9961de33bb14b2c5c9191 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 21 Feb 2023 19:54:43 +0000 Subject: [PATCH 19/69] Version bump to TQ3A.230221.002 [core/build_id.mk] Change-Id: Id560fe2e204a60430ee2f50a7ef3be010f082a17 --- 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 7d6fb7289f..9520ccd31a 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=TQ3A.230221.001 +BUILD_ID=TQ3A.230221.002 From 5810c0bae88a8591a449f9a56d58f143ab22e4ea Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Fri, 10 Feb 2023 16:48:37 +0000 Subject: [PATCH 20/69] Modified BT module to be built from source by product This CL enables the capability to build from source. Haven't implemented the function on any product yet. To enable it, please follow ag/21397639 to define flag on product mk file. Bug: 268325561 Test: manual test on local Change-Id: I10f1901ad26ef941465af20d2bb5ab49434baaf3 --- 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 aae17c306b..cba0e032c4 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -129,7 +129,7 @@ endif # are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by # default. INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ - bluetooth \ + btservices \ permission \ uwb \ wifi \ From 62cee2459135371b5e12de3b3c4e10df00eef11c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 23 Feb 2023 22:03:29 +0000 Subject: [PATCH 21/69] Version bump to TQ3A.230223.002 [core/build_id.mk] Change-Id: Ie17ff2695177ccd4976bc84d7552724035fc9d8d --- 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 5b87bdf481..75099bbcaa 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=TQ3A.230223.001 +BUILD_ID=TQ3A.230223.002 From 9edebfe7b5429f39c1d9e3e885b1e1b20d9c22e3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 2 Mar 2023 21:57:29 +0000 Subject: [PATCH 22/69] Version bump to TQ3A.230302.002 [core/build_id.mk] Change-Id: Ife302335bfec9a2d8ca5c34bab93a98237541abb --- 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 f1e22d0a4e..c391325c77 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=TQ3A.230302.001 +BUILD_ID=TQ3A.230302.002 From de89b58d95ec945b2889018e23c18f615578e50a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 3 Mar 2023 01:40:03 +0000 Subject: [PATCH 23/69] Version bump to TQ3A.230303.002 [core/build_id.mk] Change-Id: I64852c3ca4134bb14d62b8c8a85a23c9f61f6ef1 --- 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 229201e73e..48c883baf7 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=TQ3A.230303.001 +BUILD_ID=TQ3A.230303.002 From 73ca7d30ebd7a4509bfa7abc4bc11775e6402a75 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sun, 5 Mar 2023 21:41:27 +0000 Subject: [PATCH 24/69] Version bump to TQ3A.230303.002.A1 [core/build_id.mk] Change-Id: I44392ec9e5646a2cdfc7bd7b5cbdb113ea8f2111 --- 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 48c883baf7..2da7077689 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=TQ3A.230303.002 +BUILD_ID=TQ3A.230303.002.A1 From aa15850d34350f8c1487c258b1a1c975641cc84c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 6 Mar 2023 01:56:43 +0000 Subject: [PATCH 25/69] Version bump to TQ3A.230306.002 [core/build_id.mk] Change-Id: I1d8fc7b0b3d626c260b24731276453ee1aeeaaa3 --- 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 b359ec19f1..91576e6d59 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=TQ3A.230306.001 +BUILD_ID=TQ3A.230306.002 From ba7be1ebcad2cef7bf64ccd2e19649c39b1c2bad Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 7 Mar 2023 16:59:14 +0800 Subject: [PATCH 26/69] wlan: Update the path of wpa_supplicant_8_lib Add the default path back for backward compatibility Bug: 271240400 Test: Build Pass Change-Id: I0cbf7d29984bf99a01dbab39df9ff565aa6f0e55 Ignore-AOSP-First: changes in topics with internal-first --- target/product/cfi-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk index 11c01a27b5..559963cd7f 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk @@ -28,6 +28,7 @@ PRODUCT_CFI_INCLUDE_PATHS := \ hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \ hardware/synaptics/wlan/synadhd/wpa_supplicant_8_lib \ hardware/interfaces/nfc \ + hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \ hardware/qcom/wlan/legacy/qcwcn/wpa_supplicant_8_lib \ hardware/qcom/wlan/wcn6740/qcwcn/wpa_supplicant_8_lib \ hardware/interfaces/keymaster \ From ca46df57839ffd4c602cc4692271d9658ffe904a Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Thu, 15 Dec 2022 18:56:49 -0800 Subject: [PATCH 27/69] Remove tradefed-no-fwk from suites Test: presubmit Ignore-AOSP-First: Cherry pick Bug: 262597958 Change-Id: I672533c475362f4438b5aefc108749be4cfc97df (cherry picked from commit 917acd67c736894551537c52f8eebc4ab8f96b95) --- core/tasks/tools/compatibility.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 7d08a2f2e7..f640d7e3e0 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -30,7 +30,6 @@ test_suite_subdir := android-$(test_suite_name) out_dir := $(HOST_OUT)/$(test_suite_name)/$(test_suite_subdir) test_artifacts := $(COMPATIBILITY.$(test_suite_name).FILES) test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/tradefed-no-fwk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/tradefed-test-framework.jar \ $(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ From f3c892fc262ec27a642dfaeb22fd98cfdb70ee47 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 8 Mar 2023 18:46:19 +0000 Subject: [PATCH 28/69] Version bump to TQ3A.230308.002 [core/build_id.mk] Change-Id: I184cfada690ac14b0464f4dac4cebb955f6e004c --- 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 606d4ac981..7b81800217 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=TQ3A.230308.001 +BUILD_ID=TQ3A.230308.002 From 8f14dc87d9426d2d5230d76b0ca38e628dbbe551 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 8 Mar 2023 23:40:27 +0000 Subject: [PATCH 29/69] Version bump to TQ3A.230308.003 [core/build_id.mk] Change-Id: If49f33e7225c30b01579b50a958745dc13f2fead --- 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 7b81800217..6a45dd9195 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=TQ3A.230308.002 +BUILD_ID=TQ3A.230308.003 From be772485c3cd1693cedb404114d2d0de4d21e492 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 11 Mar 2023 02:47:28 +0000 Subject: [PATCH 30/69] Update Security String to 2023-05-05 Bug: 272844037 Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 --- 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 38d05107d9..419ff1aadc 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-04-05 + PLATFORM_SECURITY_PATCH := 2023-05-05 endif include $(BUILD_SYSTEM)/version_util.mk From 2130534b73bcabf2e4c098dbbc91dfaedb57f1a1 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 11 Mar 2023 02:50:43 +0000 Subject: [PATCH 31/69] Update Security String to 2023-05-01 Bug: 272844037 Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 --- 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 8806df6120..13226cdbd5 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-04-01 + PLATFORM_SECURITY_PATCH := 2023-05-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 6a3344db86ef487d7e714b76f51453da5f5c0b20 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 11 Mar 2023 02:51:58 +0000 Subject: [PATCH 32/69] Update Security String to 2023-05-01 Bug: 272844037 Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 --- 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 73ff4f56ec..2118257e1a 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-04-01 + PLATFORM_SECURITY_PATCH := 2023-05-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From a7ee9df00dee750007fb0b236b6e403636982621 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 13 Mar 2023 20:59:52 +0000 Subject: [PATCH 33/69] Version bump to TQ3A.230313.002 [core/build_id.mk] Change-Id: I3d882c563c86f38ce6804fab723a5a77b7c659cf --- 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 bf1cc2cd4a..33ec9182e4 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=TQ3A.230313.001 +BUILD_ID=TQ3A.230313.002 From 251205d866d10f6a54b54cb8122ef78de2eb01e3 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 10 Nov 2022 03:02:13 +0000 Subject: [PATCH 34/69] New product config flag to gate blueprint modules Bug: 270654958 Example usage: PRODUCT_INCLUDE_TAGS += use_myspecial_sdk This also populates the allowlist with go/nogo mainline tags. Usage of `PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error in product config Test: TH Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7 Merged-In: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7 (cherry picked from commit 055e5f89a7bc5d12877fc6bc8110c1e1e8b6ee59) --- core/product.mk | 3 +++ core/product_config.mk | 8 ++++++++ core/soong_config.mk | 2 ++ 3 files changed, 13 insertions(+) diff --git a/core/product.mk b/core/product.mk index 53fee1c54f..e57ca13b6f 100644 --- a/core/product.mk +++ b/core/product.mk @@ -267,6 +267,9 @@ _product_list_vars += PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION # This flag implies PRODUCT_USE_DYNAMIC_PARTITIONS. _product_single_value_vars += PRODUCT_RETROFIT_DYNAMIC_PARTITIONS +# List of tags that will be used to gate blueprint modules from the build graph +_product_list_vars += PRODUCT_INCLUDE_TAGS + # When this is true, various build time as well as runtime debugfs restrictions are enabled. _product_single_value_vars += PRODUCT_SET_DEBUGFS_RESTRICTIONS diff --git a/core/product_config.mk b/core/product_config.mk index 37146d3a97..b93f5be1d9 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -278,6 +278,14 @@ all_product_makefiles := all_product_configs := ############################################################################# +# Check product include tag allowlist +BLUEPRINT_INCLUDE_TAGS_ALLOWLIST := com.android.mainline_go com.android.mainline +.KATI_READONLY := BLUEPRINT_INCLUDE_TAGS_ALLOWLIST +$(foreach include_tag,$(PRODUCT_INCLUDE_TAGS), \ + $(if $(filter $(include_tag),$(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST)),,\ + $(call pretty-error, $(include_tag) is not in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST: $(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST)))) +############################################################################# + # Quick check and assign default values TARGET_DEVICE := $(PRODUCT_DEVICE) diff --git a/core/soong_config.mk b/core/soong_config.mk index dfbd08ef8b..16b7faecf6 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -292,6 +292,8 @@ $(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_ $(call add_json_bool, ForceMultilibFirstOnDevice, $(filter true,$(FORCE_MULTILIB_FIRST_ON_DEVICE))) +$(call add_json_list, IncludeTags, $(PRODUCT_INCLUDE_TAGS)) + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) From 9f5177135511acc54cbdea22587f453f540d43ee Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 17 Mar 2023 20:10:50 +0000 Subject: [PATCH 35/69] Version bump to TQ3A.230317.002 [core/build_id.mk] Change-Id: I26f9b45326a2ec8e6ea256569a368b4f0a4163f0 --- 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 54a7892334..f406736d7c 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=TQ3A.230317.001 +BUILD_ID=TQ3A.230317.002 From 7208f23412aa213abe931322c5348ba249b2e1b9 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 30 Mar 2023 00:18:15 +0000 Subject: [PATCH 36/69] Version bump to TQ3A.230324.001.X1 [core/build_id.mk] Change-Id: I25d6bfa1f59f8c6b2810c3a853c33968b977a7f6 --- 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 1c0bdd4716..6e0c0b9478 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=TQ3A.230324.001 +BUILD_ID=TQ3A.230324.001.X1 From e3819ec56d918056898ff74397c5c899ce5a092e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 31 Mar 2023 03:07:06 +0000 Subject: [PATCH 37/69] Version bump to TQ3A.230331.002 [core/build_id.mk] Change-Id: I540e629d37480cf0c47908f4b03d09368cc419f6 --- 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 5bc0a4359d..cc264ace6c 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=TQ3A.230331.001 +BUILD_ID=TQ3A.230331.002 From 91890235535b148e280f741a2030f4234bed9767 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 31 Mar 2023 21:11:55 +0000 Subject: [PATCH 38/69] Version bump to TQ3A.230331.003 [core/build_id.mk] Change-Id: I11fef8581a77cc7f1b7220b55b50029bf4b8fd91 --- 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 cc264ace6c..0a009d01ac 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=TQ3A.230331.002 +BUILD_ID=TQ3A.230331.003 From 46675b454eb8c95dfe967d08464e4c3d8d21a871 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 5 Apr 2023 17:04:54 +0000 Subject: [PATCH 39/69] Version bump to TQ3A.230405.002 [core/build_id.mk] Change-Id: I4d4ff7e0204fd5ef00578c233bbf92e750228d70 --- 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 54a410581a..809350004b 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=TQ3A.230405.001 +BUILD_ID=TQ3A.230405.002 From 9e8e6a73297ac51cbcdf7dc2a3e5a5655d41c666 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 22 Mar 2023 16:52:43 -0700 Subject: [PATCH 40/69] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 aosp_64bitonly_x86_64 gets broken by the emulator changes otherwise. Bug: 277230251 Test: m Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878 Merged-In: I31fed64619e26a1c690a6cf086c644757e45a878 Signed-off-by: Roman Kiryanov --- target/board/generic_64bitonly_x86_64/BoardConfig.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/board/generic_64bitonly_x86_64/BoardConfig.mk b/target/board/generic_64bitonly_x86_64/BoardConfig.mk index 71c4357ec4..a240eab5ee 100644 --- a/target/board/generic_64bitonly_x86_64/BoardConfig.mk +++ b/target/board/generic_64bitonly_x86_64/BoardConfig.mk @@ -26,7 +26,10 @@ TARGET_2ND_ARCH := x86 TARGET_2ND_ARCH_VARIANT := x86_64 TARGET_PRELINK_MODULE := false + include build/make/target/board/BoardConfigGsiCommon.mk + +ifndef BUILDING_GSI include build/make/target/board/BoardConfigEmuCommon.mk BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 @@ -43,3 +46,5 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" WIFI_DRIVER_FW_PATH_STA := "/dev/null" WIFI_DRIVER_FW_PATH_AP := "/dev/null" + +endif # !BUILDING_GSI From b790c9f1db927d89e403eef9e8055dc10d01cfa8 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 15:31:40 -0700 Subject: [PATCH 41/69] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS always enabled Bug: 277230251 Test: presubmit Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 Merged-In: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index c0e8730e91..5f34b68592 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -37,24 +37,16 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) BOARD_SUPER_PARTITION_SIZE := 8598323200 BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions - ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true) - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - system_ext \ - product \ - vendor + BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ + system \ + system_ext \ + product \ + vendor - TARGET_COPY_OUT_PRODUCT := product - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 - TARGET_COPY_OUT_SYSTEM_EXT := system_ext - BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 - else - TARGET_COPY_OUT_PRODUCT := system/product - TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - vendor - endif + TARGET_COPY_OUT_PRODUCT := product + BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 + TARGET_COPY_OUT_SYSTEM_EXT := system_ext + BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 # 8G BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592 From d7637446be900dcc35a9c35d817fed8ce05c2274 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 16:39:37 -0700 Subject: [PATCH 42/69] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled. Bug: 277230251 Test: presubmit Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad Merged-In: Ie0234187fd4689211f0d4530f9b96027567273ad Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 50 ++++++++++------------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 5f34b68592..5e7647613f 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -26,43 +26,29 @@ USE_OPENGL_RENDERER := true # Emulator doesn't support sparse image format. TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) - # emulator is Non-A/B device - AB_OTA_UPDATER := false +# emulator is Non-A/B device +AB_OTA_UPDATER := false - # emulator needs super.img - BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true +# emulator needs super.img +BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true - # 8G + 8M - BOARD_SUPER_PARTITION_SIZE := 8598323200 - BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions +# 8G + 8M +BOARD_SUPER_PARTITION_SIZE := 8598323200 +BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - system_ext \ - product \ - vendor +BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ + system \ + system_ext \ + product \ + vendor - TARGET_COPY_OUT_PRODUCT := product - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 - TARGET_COPY_OUT_SYSTEM_EXT := system_ext - BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_PRODUCT := product +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_SYSTEM_EXT := system_ext +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 - # 8G - BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592 - - # in build environment to speed up make -j - ifeq ($(QEMU_DISABLE_AVB),true) - BOARD_AVB_ENABLE := false - endif -else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true) - # Enable dynamic system image size and reserved 64MB in it. - BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 - BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 67108864 -else - BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 - BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640 -endif +# 8G +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592 #vendor boot BOARD_INCLUDE_DTB_IN_BOOTIMG := false From cae430a86981d6d6c053f8f8086a08f2d846e574 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 10 Apr 2023 20:54:16 +0000 Subject: [PATCH 43/69] Version bump to TQ3A.230410.001.X1 [core/build_id.mk] Change-Id: Iae83e94d26055a013b9ec6b7c7047ccd4a4bec47 --- 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 5d63cd3d4c..9bde0825e2 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=TQ3A.230410.001 +BUILD_ID=TQ3A.230410.001.X1 From b01d27312ad75ce0e0618d0b2f34cb8f8d3e0762 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 23 Mar 2023 14:53:22 -0700 Subject: [PATCH 44/69] Add the system_dlkm partition to goldfish required by GKI Bug: 277230251 Test: atest -c vts_dlkm_partition_test Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee Merged-In: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 5e7647613f..cc5e3ab88a 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -38,6 +38,7 @@ BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ system \ + system_dlkm \ system_ext \ product \ vendor @@ -47,6 +48,10 @@ BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_USES_SYSTEM_DLKMIMAGE := true +BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs +TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm + # 8G BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592 From 0cb8f7cb5051fff1c41ba3ec91502c9b84a858b3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 11 Apr 2023 00:41:09 +0000 Subject: [PATCH 45/69] Version bump to TQ3A.230411.002 [core/build_id.mk] Change-Id: Ie5d8ee6c5b777ffb7feaec28773b81b8473664ce --- 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 c7fc3f01ef..a25cc0a928 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=TQ3A.230411.001 +BUILD_ID=TQ3A.230411.002 From 98e20b0d4e62d241e3051d9bc7bb029b3374e52f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 11 Apr 2023 01:11:16 +0000 Subject: [PATCH 46/69] Version bump to TQ3A.230407.001.A1 [core/build_id.mk] Change-Id: I87f1a8f9ebd03ee4f51d13362abbbdb5e51bbe0a --- 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 33d3b92f2f..9daaadb9be 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=TQ3A.230407.001 +BUILD_ID=TQ3A.230407.001.A1 From 908e3504d87907b972037329c1ae3268923421b9 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 11 Apr 2023 01:54:53 +0000 Subject: [PATCH 47/69] Update Security String to 2023-06-05 Bug: 277078610 Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e --- 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 419ff1aadc..60bd4cdcb2 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-05-05 + PLATFORM_SECURITY_PATCH := 2023-06-05 endif include $(BUILD_SYSTEM)/version_util.mk From 8c6ca0a1e63093b4cbd8b4940ead2b535f73d1d9 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 11 Apr 2023 01:58:13 +0000 Subject: [PATCH 48/69] Update Security String to 2023-06-01 Bug: 277078610 Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e --- 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 13226cdbd5..b10856da66 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-05-01 + PLATFORM_SECURITY_PATCH := 2023-06-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 333b59fd7f93dc1e3d71d36a2ffa24523407f270 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 11 Apr 2023 01:59:48 +0000 Subject: [PATCH 49/69] Update Security String to 2023-06-01 Bug: 277078610 Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e --- 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 2118257e1a..cfedb3f0b7 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-05-01 + PLATFORM_SECURITY_PATCH := 2023-06-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 74c5cb3585e11a21d7959fc8715e5df4e05e77e5 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 14 Apr 2023 01:03:44 +0000 Subject: [PATCH 50/69] Version bump to TQ3A.230605.001 [core/build_id.mk] Change-Id: Icccdf13d2fe1f515f484439a2e43eba26f043dcd --- 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 45edc0f8a2..d72aa428bb 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=TQ3A.230413.002 +BUILD_ID=TQ3A.230605.001 From 1af14017a1d13dcc2d097da353c391d8b9e1da7c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 17 Apr 2023 00:10:48 +0000 Subject: [PATCH 51/69] Version bump to TQ3A.230605.002 [core/build_id.mk] Change-Id: I395372351dded3c6d3a955beba81b6aef589e24d --- 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 d72aa428bb..684ef794db 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=TQ3A.230605.001 +BUILD_ID=TQ3A.230605.002 From 8c177e8be48007226c063ea93847d7a859f4b966 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 17 Apr 2023 20:14:36 +0000 Subject: [PATCH 52/69] Version bump to TQ3A.230605.003 [core/build_id.mk] Change-Id: I7cbe53967ead8528ba8473da1b0a5ae15deaae93 --- 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 684ef794db..99c93b3cdc 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=TQ3A.230605.002 +BUILD_ID=TQ3A.230605.003 From 7a4506a912cd11196ff07fdae3dd0ef6da014ac6 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 18 Apr 2023 17:49:24 +0000 Subject: [PATCH 53/69] Version bump to TQ3A.230605.003.X1 [core/build_id.mk] Change-Id: Ibef5296689387a0b9fe3788d7ff78eb2f1ea9f72 --- 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 99c93b3cdc..350d4ca3c5 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=TQ3A.230605.003 +BUILD_ID=TQ3A.230605.003.X1 From 089ee9febd42875de54829ed8e8999587f8ea905 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 20 Apr 2023 01:07:16 +0000 Subject: [PATCH 54/69] Version bump to TQ3A.230605.004 [core/build_id.mk] Change-Id: I07de9c78fe048a56ab8fc2ab3002b59e7a7d7e31 --- 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 99c93b3cdc..9b02a25ece 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=TQ3A.230605.003 +BUILD_ID=TQ3A.230605.004 From fc893fadc0089edd550e7224543f0f6ba8777c58 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 22 Apr 2023 01:38:29 +0000 Subject: [PATCH 55/69] Version bump to TQ3A.230605.005 [core/build_id.mk] Change-Id: I1a95eb366aefabd0dc3685c265dbcac57c4a95ac --- 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 9b02a25ece..0431d91486 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=TQ3A.230605.004 +BUILD_ID=TQ3A.230605.005 From 6c2512c526b630e53f4819aa41c26e5c505e8031 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 25 Apr 2023 16:09:25 +0000 Subject: [PATCH 56/69] Version bump to TQ3A.230605.005.Z1 [core/build_id.mk] Change-Id: I6f9c8f7266e042bfa7d5293b8f7f1f46a82206ac --- 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 0431d91486..9331867415 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=TQ3A.230605.005 +BUILD_ID=TQ3A.230605.005.Z1 From c233bbf9bf4a1d6cd1748c62ced1771e03c45ef6 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 26 Apr 2023 02:37:02 +0000 Subject: [PATCH 57/69] Version bump to TQ3A.230605.005.W1 [core/build_id.mk] Change-Id: I166c1d0c64fd66ab0affefe6c5678f4f520c2b4f --- 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 0431d91486..97b3ca7db7 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=TQ3A.230605.005 +BUILD_ID=TQ3A.230605.005.W1 From e044a9fb2ec6836f2f6daf31293f4613a6fa34bb Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 27 Apr 2023 19:17:54 +0000 Subject: [PATCH 58/69] Version bump to TQ3A.230605.006 [core/build_id.mk] Change-Id: Id3abc587eb0da791bca10369dfa2963a0f5c58fd --- 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 0431d91486..414e6953f4 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=TQ3A.230605.005 +BUILD_ID=TQ3A.230605.006 From 9c57281fac936fd4edb938c668685d9706b5c788 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Apr 2023 17:45:53 +0000 Subject: [PATCH 59/69] Version bump to TQ3A.230605.006.X1 [core/build_id.mk] Change-Id: I707d33bd28210cf0d74e779e97e4fbf02d454698 --- 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 414e6953f4..45846d57e6 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=TQ3A.230605.006 +BUILD_ID=TQ3A.230605.006.X1 From 64a69307fc49533b12812afc2d1fc007a526f2f7 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 29 Apr 2023 20:58:09 +0000 Subject: [PATCH 60/69] Version bump to TQ3A.230605.007 [core/build_id.mk] Change-Id: I01d6211b9dfde61379fa30ef34589c0b19868e3d --- 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 414e6953f4..33cf6c40ba 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=TQ3A.230605.006 +BUILD_ID=TQ3A.230605.007 From 3e557ed8fdeab0ed9df06afdafe163247fa5bb3a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 6 May 2023 14:14:33 +0000 Subject: [PATCH 61/69] Version bump to TQ3A.230605.008 [core/build_id.mk] Change-Id: I314b3640188ed0b95e3b48112156017bfa1f3715 --- 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 33cf6c40ba..707ffc05e5 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=TQ3A.230605.007 +BUILD_ID=TQ3A.230605.008 From 105f43f6a730f999b863eeb58cd8a46a869209c0 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 9 May 2023 23:27:31 +0000 Subject: [PATCH 62/69] Version bump to TQ3A.230605.009 [core/build_id.mk] Change-Id: I96b0cf88c0a58c0628d11ecf3ad48ab8e0064987 --- 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 707ffc05e5..9eac041b4d 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=TQ3A.230605.008 +BUILD_ID=TQ3A.230605.009 From 793db33652fadc93904d813f12dd0df546bfcd64 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 10 May 2023 02:54:51 +0000 Subject: [PATCH 63/69] Version bump to TQ3A.230605.009.A1 [core/build_id.mk] Change-Id: I3c3e86941fdff2e8aec8f6adeac5ebde20c4c2d4 --- 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 9eac041b4d..8780a2f672 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=TQ3A.230605.009 +BUILD_ID=TQ3A.230605.009.A1 From 029df1931d55499afcb5e5ce13a5efd51d0219b4 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 12 May 2023 04:56:21 +0000 Subject: [PATCH 64/69] Version bump to TQ3A.230605.010 [core/build_id.mk] Change-Id: If0e1aefef4062f8db2fc465212d4d94df7f05a91 --- 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 9eac041b4d..d701ad3a47 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=TQ3A.230605.009 +BUILD_ID=TQ3A.230605.010 From e88b8f45521f0a8eea676cc16a1062943c0d8083 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 18 May 2023 16:25:37 +0000 Subject: [PATCH 65/69] Version bump to TQ3A.230605.011 [core/build_id.mk] Change-Id: Ic8c06bc6c6441445a202c7451cb242956df30612 --- 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 d701ad3a47..275f714465 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=TQ3A.230605.010 +BUILD_ID=TQ3A.230605.011 From 9c3a19c928792cbe8405773ebc832401ef71236c Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:22:21 +0000 Subject: [PATCH 66/69] Update Security String to 2023-07-05 Bug: 282371465 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c119bfaa2b768070bda5e0d9c71806d83b7e39) Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7 Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7 --- 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 60bd4cdcb2..23dce80440 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-06-05 + PLATFORM_SECURITY_PATCH := 2023-07-05 endif include $(BUILD_SYSTEM)/version_util.mk From e2bf5dfd44ab921df7983589c4f65406f7c49b39 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:22:21 +0000 Subject: [PATCH 67/69] Update Security String to 2023-07-05 Bug: 282371465 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c119bfaa2b768070bda5e0d9c71806d83b7e39) Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7 Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7 --- 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 60bd4cdcb2..23dce80440 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-06-05 + PLATFORM_SECURITY_PATCH := 2023-07-05 endif include $(BUILD_SYSTEM)/version_util.mk From 52ea1d197c1c717ecca1eca11803c9790e90d400 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 25 May 2023 00:58:15 +0000 Subject: [PATCH 68/69] Version bump to TQ3A.230605.010.A1 [core/build_id.mk] Change-Id: I864a4057004570f5efeb4c90d06cf26da89cb1bc --- 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 d701ad3a47..1ceaa50e42 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=TQ3A.230605.010 +BUILD_ID=TQ3A.230605.010.A1 From ca8fe47fab2c9decf224c9a7c4c70309884cc34d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 25 May 2023 19:20:01 +0000 Subject: [PATCH 69/69] Version bump to TQ3A.230605.012 [core/build_id.mk] Change-Id: Ie750c185483bcd4a9ed47d10793e698ef8201cfc --- 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 275f714465..9d9a9bce9c 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=TQ3A.230605.011 +BUILD_ID=TQ3A.230605.012