From b321737c6c09912f059fc0c7c8d6ad3d42f88a51 Mon Sep 17 00:00:00 2001 From: normanwhl Date: Wed, 13 Apr 2022 09:46:26 +0000 Subject: [PATCH 01/71] Enable CFI for SYNA wpa_supplicant_8 Since the wpa_supplicant_8 has enabled cfi, the static lib that it uses should enable cfi, otherwise there will be runtime crashes. Bug: 225784334 Test: lunch tangor-userdebug m -j run the image on the tangotron and wpa_supplicant should not crash with cfi failures. Change-Id: I17384a47c66cf9385cbb41ad0c0786907ce2f28c --- 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 3aa2be7bb2..386e3d9cbe 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk @@ -26,6 +26,7 @@ PRODUCT_CFI_INCLUDE_PATHS := \ frameworks/av/services \ frameworks/minikin \ 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/interfaces/keymaster \ From 1fba7adce0e92d00639b152249979efa21c3e149 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 6 May 2022 21:37:37 +0000 Subject: [PATCH 02/71] Version bump to TQ1A.220506.002 [core/build_id.mk] Change-Id: I8b316d3ce5a37c53be4228fb74e44ac3d192ac3b --- 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 96e2bc821d..30f9fda0fa 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=TQ1A.220506.001 +BUILD_ID=TQ1A.220506.002 From 0333d6fb09e0276cdf1f066fbd2e3a679f407b2e Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 13 May 2022 19:05:47 +0000 Subject: [PATCH 03/71] Version bump to TQ1A.220513.002 [core/build_id.mk] Change-Id: Ia5a2bec82156f5d7ce65356e5239ff093575bb6d --- 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 29333cfc26..f3bf3af14a 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=TQ1A.220513.001 +BUILD_ID=TQ1A.220513.002 From de3c72833cbb9a348e0173e85f4e2711656bf958 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 17 May 2022 06:07:02 +0000 Subject: [PATCH 04/71] Version bump to TQ1A.220517.002 [core/build_id.mk] Change-Id: I05ffa4344eb03440a1332f8ed8c9f8421438f19e --- 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 4fed193564..4e78ca108f 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=TQ1A.220517.001 +BUILD_ID=TQ1A.220517.002 From 65729771c9bd072dea891d00cfe5e5a664717d7d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 19 May 2022 03:41:07 +0000 Subject: [PATCH 05/71] Version bump to TQ1A.220519.002 [core/build_id.mk] Change-Id: I4f1b588b41d20bba17f3b8c3d7bb7339b988cf8b --- 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 8486965303..e01d625446 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=TQ1A.220519.001 +BUILD_ID=TQ1A.220519.002 From f4f7944f1f8a8158f4fa4b33e049956dd043a9d4 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 24 May 2022 18:46:37 +0000 Subject: [PATCH 06/71] Version bump to TQ1A.220524.002 [core/build_id.mk] Change-Id: Ib279915d5dd545ebb6694bb5efcb4d5cd5293c3a --- 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 0beb370287..342831922e 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=TQ1A.220524.001 +BUILD_ID=TQ1A.220524.002 From 8b67eef3db7d69915222c30672f88e0f56377687 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 25 May 2022 03:48:36 +0000 Subject: [PATCH 07/71] Version bump to TQ1A.220525.002 [core/build_id.mk] Change-Id: I94284071f5f37aed6efcf935f106c87babb05c8d --- 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 0db1ad37e8..7803b7e733 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=TQ1A.220525.001 +BUILD_ID=TQ1A.220525.002 From a3e8d953226989b8f776000470dacda889cd7856 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 24 Jun 2022 02:30:39 +0000 Subject: [PATCH 08/71] Version bump to TQ1A.220624.002 [core/build_id.mk] Change-Id: Ibd1cc16b607accd17523a788bfe6b918df1f5060 --- 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 7c26d6300c..5c6b9d5ac2 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=TQ1A.220624.001 +BUILD_ID=TQ1A.220624.002 From 0fa86a3027c239e88610cac38cd85212a26aa2a7 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 24 Jun 2022 19:34:37 +0000 Subject: [PATCH 09/71] Version bump to TQ1A.220624.003 [core/build_id.mk] Change-Id: I9e0adab331bfa1072c3327ecc9e8167dd44e7b21 --- 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 5c6b9d5ac2..3dc5978345 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=TQ1A.220624.002 +BUILD_ID=TQ1A.220624.003 From c48e43cf873dbfebc29f81d743b745edb9e6c826 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 28 Jun 2022 21:28:41 +0000 Subject: [PATCH 10/71] Version bump to TQ1A.220628.002 [core/build_id.mk] Change-Id: Iec7b1f56653b465d9e0ef4f4707e8a3bd46dc5da --- 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 dcb5190e27..768d9a0cf6 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=TQ1A.220628.001 +BUILD_ID=TQ1A.220628.002 From e4a50175d33abc61549a970f1cdd8b94b4458ac5 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 29 Jun 2022 03:26:39 +0000 Subject: [PATCH 11/71] Version bump to TQ1A.220629.002 [core/build_id.mk] Change-Id: Ic36b8e25cf1646ea262f78c3c09170903b7696a3 --- 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 ce76e380d4..416cb882dd 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=TQ1A.220629.001 +BUILD_ID=TQ1A.220629.002 From 2165c6482cb2f69e6cad8aa88fb0ee7a27fb0e13 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 13 Jul 2022 17:28:35 +0000 Subject: [PATCH 12/71] Version bump to TQ1A.220713.002 [core/build_id.mk] Change-Id: Ib96b54fe8e1fbf933f141389a57c4193f237873b --- 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 2e7fa7d1e1..c3882f708e 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=TQ1A.220713.001 +BUILD_ID=TQ1A.220713.002 From 5a564d837cdf3228c016b68471fbd5e004e7c1db Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Fri, 8 Apr 2022 15:20:23 -0700 Subject: [PATCH 13/71] Add support for only starting 64 bit zygote. Added code to support a single system image that can start the 64 bit zygote only, or both the 64 bit and 32 bit zygote. By default, the system will default to 64 bit only. For this image, all abilist properties are only present in the vendor partition. All other copies of these properties are deleted. Bug: 227482437 Test: Verified that secondary doesn't start with same disk image Test: with ro.zygote set to zygote64 and abilists set appropriately. Test: Verified that secondary does not start when restarting netd. Test: with ro.zygote set to zygote64_32 and abilists set appropriately. Test: Verified that secondary does start when restarting netd. Test: Verified that a 64 bit device only starts the primary. Test: Verified that a 32 bit device only starts the primary. Change-Id: Ifc6413cecc4df8ba041699f7d0b10786d1926d64 Merged-In: Ifc6413cecc4df8ba041699f7d0b10786d1926d64 --- core/sysprop.mk | 17 +++++++++++++---- target/product/core_64_bit.mk | 4 ++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/core/sysprop.mk b/core/sysprop.mk index 61c07ba603..570702a679 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -47,10 +47,18 @@ define generate-common-build-props echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\ echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\ )\ - $(if $(filter system vendor odm,$(1)),\ - echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST) " >> $(2);\ - echo "ro.$(1).product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT)" >> $(2);\ - echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\ + $(if $(filter true,$(ZYGOTE_FORCE_64)),\ + $(if $(filter vendor,$(1)),\ + echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\ + echo "ro.$(1).product.cpu.abilist32=" >> $(2);\ + echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\ + )\ + ,\ + $(if $(filter system vendor odm,$(1)),\ + echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST)" >> $(2);\ + echo "ro.$(1).product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT)" >> $(2);\ + echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\ + )\ )\ echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\ echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\ @@ -282,6 +290,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \ TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ + ZYGOTE_FORCE_64_BIT="$(ZYGOTE_FORCE_64_BIT)" \ bash $(BUILDINFO_SH) > $@ ifdef TARGET_SYSTEM_PROP diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 322fa80530..b9d22a6dd3 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -27,7 +27,11 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw # Set the zygote property to select the 64-bit primary, 32-bit secondary script # This line must be parsed before the one in core_minimal.mk +ifeq ($(ZYGOTE_FORCE_64),true) +PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64 +else PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64_32 +endif TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_64_BIT_APPS := true From e526cdc59890fc9a4a947a7af8a069438543641c Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 13 Jul 2022 22:58:40 -0700 Subject: [PATCH 14/71] Add ability to force compile as 64 bit. When trying to build a single 64 bit and 32 bit image, there are a few executables that are prefer32. When set, this will force all of those targets to be compiled as 64 bit. Bug: 229787331 Test: With this option, drmserver/mediaserver are built as 64 bit. Test: Without this option, drmserver/mediaserver are built as 32 bit. Change-Id: I84f6be7fe0fa3a9ea86ecc4dd785aaf1825f9925 Merged-In: I84f6be7fe0fa3a9ea86ecc4dd785aaf1825f9925 --- core/soong_config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index d03b687464..dfbd08ef8b 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -290,6 +290,8 @@ $(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TES $(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_NDK_PLATFORM_BACKEND))) +$(call add_json_bool, ForceMultilibFirstOnDevice, $(filter true,$(FORCE_MULTILIB_FIRST_ON_DEVICE))) + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) From 1e3a2c32543af2b93741ca3bee75e2cc5af04301 Mon Sep 17 00:00:00 2001 From: Sandeep Vijayasekar Date: Wed, 20 Jul 2022 15:08:33 -0700 Subject: [PATCH 15/71] Fix signapk jar not found for prebuilt splits Bug: 132211754 Bug: 232129462 Test: prebuild module with LOCAL_PACKAGE_SPLITS defined Change-Id: If82f06debf092fd5bdf37558d8eea62eb3b72582 --- core/app_prebuilt_internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk index 4586f356c6..eb429cdd5c 100644 --- a/core/app_prebuilt_internal.mk +++ b/core/app_prebuilt_internal.mk @@ -280,7 +280,7 @@ $(error You must put all the split source apks in the same folder: $(LOCAL_PACKA endif my_src_dir := $(LOCAL_PATH)/$(my_src_dir) -$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem +$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR) $(SIGNAPK_JNI_LIBRARY_PATH) $(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 $(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem $(built_apk_splits) : $(intermediates)/%.apk : $(my_src_dir)/%.apk From 0f03267c9542cb91cb8cdf4b96da62e2bec34cf6 Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Thu, 21 Jul 2022 10:11:00 +0000 Subject: [PATCH 16/71] wlan: Update the path of wpa_supplicant_8_lib for qcom Modify the path because we create another wifi_hal and change the file structure. Bug: 213413875 Bug: 239783932 Change-Id: I4c58c756820ee2d5e7918427a4a64b96db7c46be Test: Regression Test --- target/product/cfi-common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk index 386e3d9cbe..11c01a27b5 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk @@ -28,7 +28,8 @@ 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 \ hardware/interfaces/security \ packages/modules/Bluetooth/system \ From 6a6e70236e0f175733503ad9829855d0dcf2679a Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 25 Jul 2022 22:24:53 +0000 Subject: [PATCH 17/71] Version bump to TQ1A.220725.002 [core/build_id.mk] Change-Id: I73c4311f8cd39b41ffd43653ef5373bf6cfe2656 --- 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 485bd1b2b6..abaf6dbf62 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=TQ1A.220725.001 +BUILD_ID=TQ1A.220725.002 From b6820ad724ee925d6d4f55e44db633b6f52f4687 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 26 Jul 2022 00:50:41 +0000 Subject: [PATCH 18/71] Version bump to TQ1A.220726.002 [core/build_id.mk] Change-Id: I0b52b77683c75f9f0de8100cb3896f40f34d34a6 --- 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 5b080c5795..8028f510e3 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=TQ1A.220726.001 +BUILD_ID=TQ1A.220726.002 From 305bc13335d747fc103394d9e33f087111f3f5dc Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 26 Jul 2022 21:28:49 +0000 Subject: [PATCH 19/71] Version bump to TQ1A.220726.003 [core/build_id.mk] Change-Id: Iff35207f612764474f14f6cbfe8dc163a41146d7 --- 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 8028f510e3..8733eb8be6 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=TQ1A.220726.002 +BUILD_ID=TQ1A.220726.003 From d56323a5404dd2f3cfc8fb7a57d0064e68085403 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 27 Jul 2022 00:26:57 +0000 Subject: [PATCH 20/71] Version bump to TQ1A.220727.002 [core/build_id.mk] Change-Id: I31e9e1de5cf987610e73549c8175fbffb0a5576d --- 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 330501ddf7..4867576a20 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=TQ1A.220727.001 +BUILD_ID=TQ1A.220727.002 From d041329fa01f4f963dc9ac15e4ab2e8313b8c70a Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Wed, 27 Jul 2022 21:53:43 +0000 Subject: [PATCH 21/71] Update Security String to 2022-09-05 Bug: 238435977 Change-Id: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1 --- 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 65957c8859..5883925c73 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-08-05 + PLATFORM_SECURITY_PATCH := 2022-09-05 endif include $(BUILD_SYSTEM)/version_util.mk From a61a7d7ee50425d6cb5a2dcad9d2b44c52e8f157 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 28 Jul 2022 22:39:30 +0000 Subject: [PATCH 22/71] Update Security String to 2022-09-01 Bug: 238435977 Change-Id: Ief6d0c790a563be2f273fe5d4ac4063237cefdfc Merged-In: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1 --- 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 ce1574e331..9fa123c855 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-08-01 + PLATFORM_SECURITY_PATCH := 2022-09-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 1af3c97b7c472ef280da1cb1197ce449c955869a Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 29 Jul 2022 22:23:48 +0000 Subject: [PATCH 23/71] Update Security String to 2022-09-01 Bug: 238435977 Change-Id: Ia6e58f49f783aa9af17622697ccae30f95f8938a Merged-In: Ief6d0c790a563be2f273fe5d4ac4063237cefdfc --- 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 ba18c14a60..53b2abc47d 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-08-01 + PLATFORM_SECURITY_PATCH := 2022-09-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 09970c7ee86194e7a90f6700729586db82201df1 Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Tue, 2 Aug 2022 01:17:22 +0000 Subject: [PATCH 24/71] Revert "Remove IntentResolver from build" This reverts commit 42d97799f33ec94f631d97d2b2f140db96b016aa. Reason for revert: Resuming unbundled sharesheet development Bug: 241104067 Change-Id: I4f62185350d71621291f71d70fa63793d31a4706 --- 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 c919ac462b..de3217119a 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -120,6 +120,7 @@ PRODUCT_PACKAGES += \ init_system \ input \ installd \ + IntentResolver \ ip \ iptables \ ip-up-vpn \ From d92266638145c2420af606de66c159cdb75a4c4e Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 2 Aug 2022 17:46:48 +0000 Subject: [PATCH 25/71] Fix missing notices. Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile Fix typos DLMK -> DLKM Bug: 240582127 Test: m droid dist Test: tapas google-tradefed-all && m dist Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86 TARGET_BUILD_VARIANT=eng droid dist checkbuild Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=userdebug droid dist checkbuild Change-Id: If780669602c459c337585e9d2c4915b28844e2bb Merged-in: If780669602c459c337585e9d2c4915b28844e2bb --- core/Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++ core/os_licensing.mk | 36 ++++++++++--------------- 2 files changed, 76 insertions(+), 22 deletions(-) diff --git a/core/Makefile b/core/Makefile index de9fd52c12..309a179ee0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1688,6 +1688,63 @@ endif # PRODUCT_NOTICE_SPLIT ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz) +need_vendor_notice:=false +ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) + need_vendor_notice:=true +endif + +ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE + need_vendor_notice:=true +endif + +ifdef BUILDING_VENDOR_IMAGE + need_vendor_notice:=true +endif + +ifeq (true,$(need_vendor_notice)) +ifneq (,$(installed_vendor_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz) +endif +endif + +need_vendor_notice:= + +ifdef BUILDING_ODM_IMAGE +ifneq (,$(installed_odm_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz) +endif +endif + +ifdef BUILDING_PRODUCT_IMAGE +ifneq (,$(installed_product_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz) +endif +endif + +ifdef BUILDING_SYSTEM_EXT_IMAGE +ifneq (,$(installed_system_ext_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz) +endif +endif + +ifdef BUILDING_VENDOR_DLKM_IMAGE +ifneq (,$(installed_vendor_dlkm_notice_xml_gz) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz) +endif +endif + +ifdef BUILDING_ODM_DLKM_IMAGE +ifneq (,$(installed_odm_dlkm_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz) +endif +endif + +ifdef BUILDING_SYSTEM_DLKM_IMAGE +ifneq (,$(installed_system_dlkm_notice_xml_gz)) +ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz) +endif +endif + endif # TARGET_BUILD_APPS # The kernel isn't really a module, so to get its module file in there, we @@ -3879,6 +3936,11 @@ $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET): \ $(INSTALLED_FILES_FILE_SYSTEM_DLKM) $(build-system_dlkmimage-target) +SYSTEM_DLKM_NOTICE_DEPS += $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) + +$(call declare-1p-container,$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),) +$(call declare-container-license-deps,$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) $(INSTALLED_FILES_FILE_SYSTEM_DLKM),$(PRODUCT_OUT)/:/) + .PHONY: system_dlkmimage-nodeps sdnod system_dlkmimage-nodeps sdnod: | $(INTERNAL_USERIMAGES_DEPS) $(build-system_dlkmimage-target) diff --git a/core/os_licensing.mk b/core/os_licensing.mk index d8d3c78945..416e4b22af 100644 --- a/core/os_licensing.mk +++ b/core/os_licensing.mk @@ -23,7 +23,6 @@ endif $(call declare-0p-target,$(target_notice_file_xml_gz)) $(call declare-0p-target,$(installed_notice_html_or_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz) endif .PHONY: vendorlicense @@ -35,18 +34,17 @@ VENDOR_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) $(eval $(call text-notice-rule,$(target_vendor_notice_file_txt),"Vendor image", \ "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \ - $(VENDOR_NOTICE_DEPS))) + $(VENDOR_NOTICE_DEPS),$(VENDOR_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_vendor_notice_file_xml_gz),"Vendor image", \ "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \ - $(VENDOR_NOTICE_DEPS))) + $(VENDOR_NOTICE_DEPS),$(VENDOR_NOTICE_DEPS))) $(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_vendor_notice_file_xml_gz)) $(call declare-0p-target,$(installed_vendor_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz) endif .PHONY: odmlicense @@ -55,18 +53,17 @@ odmlicense: $(call corresponding-license-metadata, $(ODM_NOTICE_DEPS)) reportmis ifneq (,$(ODM_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_odm_notice_file_txt),"ODM filesystem image", \ "Notices for files contained in the odm filesystem image in this directory:", \ - $(ODM_NOTICE_DEPS))) + $(ODM_NOTICE_DEPS),$(ODM_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_odm_notice_file_xml_gz),"ODM filesystem image", \ "Notices for files contained in the odm filesystem image in this directory:", \ - $(ODM_NOTICE_DEPS))) + $(ODM_NOTICE_DEPS),$(ODM_NOTICE_DEPS))) $(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_odm_notice_file_xml_gz)) $(call declare-0p-target,$(installed_odm_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz) endif .PHONY: oemlicense @@ -78,18 +75,17 @@ productlicense: $(call corresponding-license-metadata, $(PRODUCT_NOTICE_DEPS)) r ifneq (,$(PRODUCT_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_product_notice_file_txt),"Product image", \ "Notices for files contained in the product filesystem image in this directory:", \ - $(PRODUCT_NOTICE_DEPS))) + $(PRODUCT_NOTICE_DEPS),$(PRODUCT_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_product_notice_file_xml_gz),"Product image", \ "Notices for files contained in the product filesystem image in this directory:", \ - $(PRODUCT_NOTICE_DEPS))) + $(PRODUCT_NOTICE_DEPS),$(PRODUCT_NOTICE_DEPS))) $(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_product_notice_file_xml_gz)) $(call declare-0p-target,$(installed_product_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz) endif .PHONY: systemextlicense @@ -98,18 +94,17 @@ systemextlicense: $(call corresponding-license-metadata, $(SYSTEM_EXT_NOTICE_DEP ifneq (,$(SYSTEM_EXT_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_system_ext_notice_file_txt),"System_ext image", \ "Notices for files contained in the system_ext filesystem image in this directory:", \ - $(SYSTEM_EXT_NOTICE_DEPS))) + $(SYSTEM_EXT_NOTICE_DEPS),$(SYSTEM_EXT_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_system_ext_notice_file_xml_gz),"System_ext image", \ "Notices for files contained in the system_ext filesystem image in this directory:", \ - $(SYSTEM_EXT_NOTICE_DEPS))) + $(SYSTEM_EXT_NOTICE_DEPS),$(SYSTEM_EXT_NOTICE_DEPS))) $(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_system_ext_notice_file_xml_gz)) $(call declare-0p-target,$(installed_system_ext_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz) endif .PHONY: vendor_dlkmlicense @@ -118,18 +113,17 @@ vendor_dlkmlicense: $(call corresponding-license-metadata, $(VENDOR_DLKM_NOTICE_ ifneq (,$(VENDOR_DLKM_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_vendor_dlkm_notice_file_txt),"Vendor_dlkm image", \ "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \ - $(VENDOR_DLKM_NOTICE_DEPS))) + $(VENDOR_DLKM_NOTICE_DEPS),$(VENDOR_DLKM_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_vendor_dlkm_notice_file_xml_gz),"Vendor_dlkm image", \ "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \ - $(VENDOR_DLKM_NOTICE_DEPS))) + $(VENDOR_DLKM_NOTICE_DEPS),$(VENDOR_DLKM_NOTICE_DEPS))) $(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz)) $(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz) endif .PHONY: odm_dlkmlicense @@ -138,18 +132,17 @@ odm_dlkmlicense: $(call corresponding-license-metadata, $(ODM_DLKM_NOTICE_DEPS)) ifneq (,$(ODM_DLKM_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_odm_dlkm_notice_file_txt),"ODM_dlkm filesystem image", \ "Notices for files contained in the odm_dlkm filesystem image in this directory:", \ - $(ODM_DLKM_NOTICE_DEPS))) + $(ODM_DLKM_NOTICE_DEPS),$(ODM_DLKM_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_odm_dlkm_notice_file_xml_gz),"ODM_dlkm filesystem image", \ "Notices for files contained in the odm_dlkm filesystem image in this directory:", \ - $(ODM_DLMK_NOTICE_DEPS))) + $(ODM_DLKM_NOTICE_DEPS),$(ODM_DLKM_NOTICE_DEPS))) $(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz)) $(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz) endif .PHONY: system_dlkmlicense @@ -158,18 +151,17 @@ system_dlkmlicense: $(call corresponding-license-metadata, $(SYSTEM_DLKM_NOTICE_ ifneq (,$(SYSTEM_DLKM_NOTICE_DEPS)) $(eval $(call text-notice-rule,$(target_system_dlkm_notice_file_txt),"System_dlkm filesystem image", \ "Notices for files contained in the system_dlkm filesystem image in this directory:", \ - $(SYSTEM_DLKM_NOTICE_DEPS))) + $(SYSTEM_DLKM_NOTICE_DEPS),$(SYSTEM_DLKM_NOTICE_DEPS))) $(eval $(call xml-notice-rule,$(target_system_dlkm_notice_file_xml_gz),"System_dlkm filesystem image", \ "Notices for files contained in the system_dlkm filesystem image in this directory:", \ - $(SYSTEM_DLMK_NOTICE_DEPS))) + $(SYSTEM_DLKM_NOTICE_DEPS),$(SYSTEM_DLKM_NOTICE_DEPS))) $(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz) $(copy-file-to-target) $(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz)) $(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz)) -ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz) endif endif # not TARGET_BUILD_APPS From 9780e330b30d6f566d3f48cac9c47a5c6869da15 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Mon, 13 Jun 2022 09:32:49 -0700 Subject: [PATCH 26/71] Enable R8 code shrinking for system_server by default Flip the setting that controls R8 shrinking for system_server from opt-in to opt-out. This can be controlled by vendor makefiles and from the command-line using the `SYSTEM_OPTIMIZE_JAVA` boolean build flag. Note that this change only enables code shrinking for system_server, and should not impact stack traces except for certain stack frames involving synthetics. Additional (vendor) code that is loaded dynamically into system_server, that references system_server code, should use system_server APIs that are expicitly annotated with `@android.annotation.SystemApi`. Additional (vendor) code added directly to services.jar, which doesn't fall into existing keep patterns in the services proguard.flags configuration and would otherwise be stripped, should be annotated with `@com.android.internal.annotations.Keep`. Results: services.jar (20MB -> 17MB) Bug: 210510433 Test: atest CtsInstalledLoadingProgressHostTests CtsAutoFillServiceTestCases CtsAppSecurityHostTestCases CtsAppTestCases Change-Id: Icc77c9451d9a4a83e02cb591693354988f8d0ec4 Merged-In: Icc77c9451d9a4a83e02cb591693354988f8d0ec4 --- core/android_soong_config_vars.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 2880b287c5..bd6e8ee362 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -150,8 +150,9 @@ endif # TODO(b/203088572): Remove when Java optimizations enabled by default for # SystemUI. $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA) -# TODO(b/196084106): Remove when Java optimizations enabled by default for -# system packages. +# Enable by default unless explicitly set or overridden. +# See frameworks/base/services/Android.bp for additional notes on side effects. +SYSTEM_OPTIMIZE_JAVA ?= true $(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA) # Check for SupplementalApi module. From 0fa2f42a4f2c86a70d524352df9d5a149889815c Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Thu, 28 Jul 2022 17:22:23 -0700 Subject: [PATCH 27/71] Tune R8 shrinking defaults for system_server Disable R8 shrinking by default if there are additional SYSTEM_SERVER_JARS that may be downstream from services.jar, or if the jar ordering is unreliable. The longer term solution will be to feed R8 the SYSTEM_SERVER_JARS explicitly during the shrinking phase, but for now this avoids potential issues with such dowstream jars. Note that specific products or targets can still opt-in explicitly even if there may be ordering issues in SYSTEM_SERVER_JARS. Bug: 240588226,235484969 Test: m + lunch various Arc/Wear/Auto targets Change-Id: I1d824e1e61de65604123b65b25b192a8a32fd0c1 Merged-In: I1d824e1e61de65604123b65b25b192a8a32fd0c1 --- core/android_soong_config_vars.mk | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index bd6e8ee362..776d73f292 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -150,9 +150,22 @@ endif # TODO(b/203088572): Remove when Java optimizations enabled by default for # SystemUI. $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA) -# Enable by default unless explicitly set or overridden. -# See frameworks/base/services/Android.bp for additional notes on side effects. -SYSTEM_OPTIMIZE_JAVA ?= true + +# 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 +# system_server jars automatically w/ R8. +ifeq (true,$(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS)) + # If system_server jar ordering is broken, don't assume services.jar can be + # safely optimized in isolation, as there may be dependent jars. + SYSTEM_OPTIMIZE_JAVA ?= false +else ifneq (platform:services,$(lastword $(PRODUCT_SYSTEM_SERVER_JARS))) + # If services is not the final jar in the dependency ordering, don't assume + # it can be safely optimized in isolation, as there may be dependent jars. + SYSTEM_OPTIMIZE_JAVA ?= false +else + SYSTEM_OPTIMIZE_JAVA ?= true +endif $(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA) # Check for SupplementalApi module. From e2d4f471d37debd59e4d48be0f1b361403e01da3 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 5 Aug 2022 13:36:26 -0700 Subject: [PATCH 28/71] Enable SystemUI R8 optimizations by default This has been the default setting for Pixel/Go/Cuttlefish devices since tm-dev. Broaden the default to enable for all devices against the base SystemUI target. Note that packages overriding the base SystemUI target may choose to ignore this flag and set their own optimization settings. Opting out of optimizations can be achieved with either: * Env: export SYSTEMUI_OPTIMIZE_JAVA=false * Make: SYSTEMUI_OPTIMIZE_JAVA := false Bug: 203472868 Test: m + presubmit + validate dex on new lunch targets Change-Id: Id97031cc2c0d1d614391c404850002faf57bd4ac --- core/android_soong_config_vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 2880b287c5..d0a2b10a96 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -147,8 +147,8 @@ ifeq (eng,$(TARGET_BUILD_VARIANT)) $(call soong_config_set,messaging,build_variant_eng,true) endif -# TODO(b/203088572): Remove when Java optimizations enabled by default for -# SystemUI. +# Enable SystemUI optimizations by default unless explicitly set. +SYSTEMUI_OPTIMIZE_JAVA ?= true $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA) # TODO(b/196084106): Remove when Java optimizations enabled by default for # system packages. From 591d2e93fbd03a9b1490810e57885e9d898f7ff7 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Mon, 8 Aug 2022 20:56:29 -0700 Subject: [PATCH 29/71] Get rid of inprocess network stack product packages from Go defaults. Moved this to gms_base.mk Bug: 241180471 Fixes: 241180471 Test: atest android.net.EthernetTetheringTest Change-Id: I4e1b4b99a008a36230a125953a20248208c5c623 --- target/product/go_defaults_common.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk index 7f19615edf..51a1ef6ec4 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -36,12 +36,6 @@ PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/config/boot-im # Do not generate libartd. PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false -# Do not spin up a separate process for the network stack on go devices, use an in-process APK. -PRODUCT_PACKAGES += InProcessNetworkStack -PRODUCT_PACKAGES += CellBroadcastAppPlatform -PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform -PRODUCT_PACKAGES += com.android.tethering.inprocess - # Strip the local variable table and the local variable type table to reduce # the size of the system image. This has no bearing on stack traces, but will # leave less information available via JDWP. From bbf8ab0de1eaa77113151620e01d42657cdcd067 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 11 Aug 2022 03:54:48 +0000 Subject: [PATCH 30/71] Version bump to TQ1A.220811.002 [core/build_id.mk] Change-Id: I37aac4bece4484832e8f4a6d7cfedc8e38807146 --- 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 670a991c12..939ec566d3 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=TQ1A.220811.001 +BUILD_ID=TQ1A.220811.002 From 68867443b57c46783e8a4701994b812c3d809439 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 12 Jul 2022 13:35:26 +0000 Subject: [PATCH 31/71] Add permission to the list of individually toggleable modules This is safe even though permission is not an optional mainline module because devices that support mainline must pass GTS and testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS currently tests this, along with testMainlineApprovedTrain which checks mandatory/optional, signing keys, and if what's preloaded are part of approved trains. Bug: 238175656 Test: # Cherry pick to branch that has Google signed prebuilts for # permission and builds from prebuilts by default. # Update the permission to an sdk snapshot generated with # r.android.com/2151273. # Make sure that the permission is built from prebuilts by # default Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 (cherry picked from commit fb72d542ad0a766683b86fc48b6a9301140eea04) Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 --- core/android_soong_config_vars.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 776d73f292..54932001c5 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -126,6 +126,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) # default. INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ bluetooth \ + permission \ uwb \ wifi \ From 646c0e2a46dd7fbdcea002d3c5d503ecbf2ab791 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Wed, 10 Aug 2022 19:26:32 -0700 Subject: [PATCH 32/71] Add per-file OWNERS for Android Go specific files. Bug: N/A Test: N/A Change-Id: Idff60019629226119c42906cc832344d6004b688 Merged-In: f852dd7fba9b666554dec7b352c4ea9b31a5e1fc --- target/product/OWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/OWNERS b/target/product/OWNERS index b3d89980ee..30b1af6324 100644 --- a/target/product/OWNERS +++ b/target/product/OWNERS @@ -3,3 +3,8 @@ per-file runtime_libart.mk = calin@google.com, mast@google.com, ngeoffray@google # GSI per-file gsi_release.mk = file:/target/product/gsi/OWNERS per-file developer_gsi_keys.mk = file:/target/product/gsi/OWNERS + +# Android Go +per-file go_defaults.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com +per-file go_defaults_512.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com +per-file go_defaults_common.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com From 2b9a8eff64bd5d0bf1a0ec5c9ca3b530ab422c50 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 11 Aug 2022 20:02:29 +0000 Subject: [PATCH 33/71] Version bump to TQ1A.220811.003 [core/build_id.mk] Change-Id: I5385359e0235577196afbaf5733aa0ba2c378e82 --- 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 939ec566d3..23a24306b6 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=TQ1A.220811.002 +BUILD_ID=TQ1A.220811.003 From 763c03967ebba5711c489da81503ec568d493222 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:39:26 +0000 Subject: [PATCH 34/71] Update Security String to 2022-10-05 Bug: 242323332 Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db --- 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 5883925c73..3dc896501b 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-09-05 + PLATFORM_SECURITY_PATCH := 2022-10-05 endif include $(BUILD_SYSTEM)/version_util.mk From a7c1e1854d56af36483a4fab1dbcd5d26c75e71f Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 19 Aug 2022 22:32:32 +0000 Subject: [PATCH 35/71] Version bump to TQ1A.220819.002 [core/build_id.mk] Change-Id: Icbc298085f3a3dfc443f7522fa1ff2919ceb12e2 --- 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 05e60ffe07..41bf6d4745 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=TQ1A.220819.001 +BUILD_ID=TQ1A.220819.002 From 87cae0791c4ca50d9621971b08a68b9776e9eccd Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 22 Aug 2022 20:30:19 +0000 Subject: [PATCH 36/71] Update Security String to 2022-10-01 Bug: 242323332 Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db Merged-In: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db --- 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 53b2abc47d..1cb53adba8 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-09-01 + PLATFORM_SECURITY_PATCH := 2022-10-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 2e04ab82f0ad1ee5bf4a1ac1343db3002c0c88c1 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Wed, 24 Aug 2022 04:43:14 +0000 Subject: [PATCH 37/71] Update Security String to 2022-10-01 Bug: 242323332 Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db Merged-In: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db --- 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 9fa123c855..734d043473 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-09-01 + PLATFORM_SECURITY_PATCH := 2022-10-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 21af62ffa1bba406dcf8f322e7bce7b63f0111a9 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 24 Aug 2022 16:34:46 +0000 Subject: [PATCH 38/71] Version bump to TQ1A.220824.002 [core/build_id.mk] Change-Id: If56045875161156ce5c07bca685a427af7e789b9 --- 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 23d7c549bd..3a965bc693 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=TQ1A.220824.001 +BUILD_ID=TQ1A.220824.002 From eb65951c85bbfecb9f54d4fa7c257bdd19352c65 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 24 Aug 2022 21:14:45 +0000 Subject: [PATCH 39/71] Version bump to TQ1A.220824.003 [core/build_id.mk] Change-Id: I15290920e0961ffea4873b8f298860ab38a98d95 --- 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 3a965bc693..c1e6bf4203 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=TQ1A.220824.002 +BUILD_ID=TQ1A.220824.003 From d6f740b0db75929fc746bc2deef2c04a284bf165 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 25 Aug 2022 00:38:37 +0000 Subject: [PATCH 40/71] Version bump to TQ1A.220825.002 [core/build_id.mk] Change-Id: I82a44b8cf1e1202e42af5fcacb9c66b06f64a2f3 --- 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 a58b98f920..01c9c7fa11 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=TQ1A.220825.001 +BUILD_ID=TQ1A.220825.002 From f18b74e479aaafeef7ff242941773a9b921f7615 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 26 Aug 2022 00:52:42 +0000 Subject: [PATCH 41/71] Version bump to TQ1A.220826.002 [core/build_id.mk] Change-Id: Id98f5f3f453407ab396191dc99700636b468596a --- 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 eb429830cf..7f77b5c40b 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=TQ1A.220826.001 +BUILD_ID=TQ1A.220826.002 From d5143ca39a64ec75fffb6fe996370e23fe89d1dc Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 27 Apr 2022 11:55:08 -0700 Subject: [PATCH 42/71] Fix incorrect function call in product-graph This was accidentally broken in aosp/2064287 Fixes: 230599451 Test: m product-graph Change-Id: Ibc9aabc5ddf7ad4d347e89019be44ef0c8ae0ff7 --- core/product-graph.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/product-graph.mk b/core/product-graph.mk index 379110e902..4a44837c54 100644 --- a/core/product-graph.mk +++ b/core/product-graph.mk @@ -25,7 +25,7 @@ define gather-all-makefiles-for-current-product-inner $(if $(filter $(p),$(_all_products_visited)),, \ $(p) \ $(eval _all_products_visited += $(p)) \ - $(call all-products-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM)) + $(call gather-all-makefiles-for-current-product-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM)) ) \ ) endef From 2b53204e9bb580c5b337a416de5dc6060805f743 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 29 Aug 2022 19:18:43 +0000 Subject: [PATCH 43/71] Version bump to TQ1A.220829.002 [core/build_id.mk] Change-Id: Id29d41d62492a39599c1d7e31bce73f10cc03dd7 --- 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 ad00eade2b..45c1122251 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=TQ1A.220829.001 +BUILD_ID=TQ1A.220829.002 From 04e3d03554b0cada8bfb21bda9dfec9c600c7311 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 30 Aug 2022 03:52:34 +0000 Subject: [PATCH 44/71] Version bump to TQ1A.220830.002 [core/build_id.mk] Change-Id: I7e2de305e3f900f730f6080f761da5d5b99dd483 --- 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 1fab708b33..74e0358933 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=TQ1A.220830.001 +BUILD_ID=TQ1A.220830.002 From a92e729f2d650a84162d31bec35ded6e4400e574 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 31 Aug 2022 07:06:30 +0000 Subject: [PATCH 45/71] Version bump to TQ1A.220831.002 [core/build_id.mk] Change-Id: I2219a35120fd04d1af4502f9043e2c01b51b4ba1 --- 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 b756fa1991..6e9ee7672c 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=TQ1A.220831.001 +BUILD_ID=TQ1A.220831.002 From 5987bd823be1a652f053add8b43a9dfb5bd0ca46 Mon Sep 17 00:00:00 2001 From: Duy Truong Date: Fri, 26 Aug 2022 13:47:55 -0700 Subject: [PATCH 46/71] Initial STS sdk Bug: 238373261 Test: m sts-sdk Test: unzip sts-sdk.zip && tree -a Test: echo 'sdk.dir=/home/duytruong/Android/Sdk' > local.properties && ./gradlew assemblestsarm Change-Id: I7e7cf112d5fcd391169982a55e1d951a808b472d --- core/tasks/sts-lite.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 core/tasks/sts-lite.mk diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk new file mode 100644 index 0000000000..dee25d4802 --- /dev/null +++ b/core/tasks/sts-lite.mk @@ -0,0 +1,40 @@ +# 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. + +ifneq ($(wildcard test/sts/README-sts-sdk.md),) +test_suite_name := sts-lite +test_suite_tradefed := sts-tradefed +test_suite_readme := test/sts/README-sts-sdk.md +sts_sdk_zip := $(HOST_OUT)/$(test_suite_name)/sts-sdk.zip + +include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk + +sts_sdk_samples := $(call intermediates-dir-for,ETC,sts-sdk-samples.zip)/sts-sdk-samples.zip + +$(sts_sdk_zip): STS_LITE_ZIP := $(compatibility_zip) +$(sts_sdk_zip): STS_SDK_SAMPLES := $(sts_sdk_samples) +$(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) + rm -f $@ $(STS_LITE_ZIP)_filtered + $(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/' + $(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES) + rm -f $(STS_LITE_ZIP)_filtered + +.PHONY: sts-sdk +sts-sdk: $(sts_sdk_zip) +$(call dist-for-goals, sts-sdk, $(sts_sdk_zip)) + +endif From 5c1dd94e63005526c9c9d9f21690aca347380a18 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 6 Sep 2022 17:52:33 +0000 Subject: [PATCH 47/71] Version bump to TQ1A.220906.002 [core/build_id.mk] Change-Id: Ie79cb2f9e19a75d4378a85ebba9311bd5fd56aed --- 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 bcf9c4b038..0c164bdbe9 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=TQ1A.220906.001 +BUILD_ID=TQ1A.220906.002 From 8adde5c881e1d44496d7b2bcd8105e50ad99ef79 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 9 Sep 2022 02:06:46 +0000 Subject: [PATCH 48/71] Version bump to TQ1A.220909.002 [core/build_id.mk] Change-Id: I95e873b0f68f66c9075aad2eb5557714d7b60dd6 --- 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 dfda36976b..bee0a80628 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=TQ1A.220909.001 +BUILD_ID=TQ1A.220909.002 From 8d9f8ce936cc2d9955fa805eeb5ef805296d2bf3 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 7 Sep 2022 15:34:12 -0700 Subject: [PATCH 49/71] Add kernel license text. Bug: 244521066 Bug: 245953754 Test: m droid dist Change-Id: Ie7052d97cbe11df8f6a184663903e66ae5cd5752 Merged-in: Ie7052d97cbe11df8f6a184663903e66ae5cd5752 --- core/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/Makefile b/core/Makefile index 309a179ee0..72aa890cea 100644 --- a/core/Makefile +++ b/core/Makefile @@ -935,6 +935,7 @@ ifdef my_installed_prebuilt_gki_apex my_apex_extracted_boot_image := $(ALL_MODULES.$(my_installed_prebuilt_gki_apex).EXTRACTED_BOOT_IMAGE) INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img $(eval $(call copy-one-file,$(my_apex_extracted_boot_image),$(INSTALLED_BOOTIMAGE_TARGET))) + $(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot) INTERNAL_PREBUILT_BOOTIMAGE := $(my_apex_extracted_boot_image) @@ -1102,7 +1103,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILE $(call pretty,"Target boot image: $@") $(call build_boot_board_avb_enabled,$@) -$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot) $(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES) $(INTERNAL_GKI_CERTIFICATE_DEPS),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET) @@ -1148,7 +1149,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_ $(call pretty,"Target boot image: $@") $(call build_boot_supports_vboot,$@) -$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot) $(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET) @@ -1170,7 +1171,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(call pretty,"Target boot image: $@") $(call build_boot_novboot,$@) -$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot) $(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET) @@ -1197,7 +1198,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE) $(AVBTOOL) $(BOARD --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) \ $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS) -$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool) $(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_PREBUILT_BOOTIMAGE),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET) @@ -1565,7 +1566,6 @@ ifndef TARGET_BUILD_APPS # TARGET_OUT_NOTICE_FILES now that the notice files are gathered from # the src subdirectory. kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt -winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt # Some targets get included under $(PRODUCT_OUT) for debug symbols or other # reasons--not to be flashed onto any device. Targets under these directories @@ -1747,15 +1747,15 @@ endif endif # TARGET_BUILD_APPS -# The kernel isn't really a module, so to get its module file in there, we -# make the target NOTICE files depend on this particular file too, which will -# then be in the right directory for the find in combine-notice-files to work. +# Presently none of the prebuilts etc. comply with policy to have a license text. Fake one here. $(eval $(call copy-one-file,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,$(kernel_notice_file))) -# No matter where it gets copied from, a copied linux kernel is licensed under "GPL 2.0 only" -$(eval $(call declare-copy-files-license-metadata,,:kernel,SPDX-license-identifier-GPL-2.0-only,notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,)) +ifneq (,$(strip $(INSTALLED_KERNEL_TARGET))) +$(call declare-license-metadata,$(INSTALLED_KERNEL_TARGET),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel) +endif -$(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_notice_file))) +# No matter where it gets copied from, a copied linux kernel is licensed under "GPL 2.0 only" +$(eval $(call declare-copy-files-license-metadata,,:kernel,SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,kernel)) # ################################################################# @@ -2553,7 +2553,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps) $(call pretty,"Target boot image from recovery: $@") $(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@)))) -$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool) $(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET) @@ -2724,7 +2724,7 @@ $(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET) $(call pretty,"Target boot debug image: $@") $(call build-debug-bootimage-target, $@) -$(call declare-1p-container,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),) +$(call declare-container-license-metadata,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot) $(call declare-container-license-deps,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(INSTALLED_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/) UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_BOOTIMAGE_TARGET) From 831521e2fef74aba45d27eab3d92a60718f4ae2f Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:25:14 +0000 Subject: [PATCH 50/71] Update Security String to 2022-11-05 Bug: 244460991 Change-Id: If6c0dc2d69b70f9722da0950582aa5acf224c0fe --- 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 3dc896501b..0884e8591d 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-10-05 + PLATFORM_SECURITY_PATCH := 2022-11-05 endif include $(BUILD_SYSTEM)/version_util.mk From ea15a5ac289babba2f642fde66f9764f5be044a3 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:30:15 +0000 Subject: [PATCH 51/71] Update Security String to 2022-11-01 Bug: 244460991 Change-Id: If6c0dc2d69b70f9722da0950582aa5acf224c0fe Merged-In: If6c0dc2d69b70f9722da0950582aa5acf224c0fe --- 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 1cb53adba8..13d7d7a106 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-10-01 + PLATFORM_SECURITY_PATCH := 2022-11-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From f3d97804ef822bc7be1f9951a82c1fb42ebd0708 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 12 Sep 2022 20:48:21 +0000 Subject: [PATCH 52/71] Update Security String to 2022-11-01 Bug: 244460991 Change-Id: If6c0dc2d69b70f9722da0950582aa5acf224c0fe Merged-In: If6c0dc2d69b70f9722da0950582aa5acf224c0fe --- 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 734d043473..5c8edc86cf 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-10-01 + PLATFORM_SECURITY_PATCH := 2022-11-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 788dcd5ba990bad1ffed01fe390f6326a21b1a8d Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 15 Sep 2022 05:16:41 +0000 Subject: [PATCH 53/71] Version bump to TQ1A.220915.002 [core/build_id.mk] Change-Id: I34bc64345234da6167a0ad38ca26b79dec47406a --- 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 a26f9f4042..23cea6adae 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=TQ1A.220915.001 +BUILD_ID=TQ1A.220915.002 From 575d0ab8df24991db5f0c67faa724f6567740512 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 16 Sep 2022 00:44:45 +0000 Subject: [PATCH 54/71] Version bump to TQ1A.220916.002 [core/build_id.mk] Change-Id: I58a72c4730bf757731d566389ade258395f65075 --- 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 da5fea96cc..7c3103fe32 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=TQ1A.220916.001 +BUILD_ID=TQ1A.220916.002 From 7677cc1bd5b7a6528536777f342f7d8ac4d3deaf Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 30 Sep 2022 00:17:59 +0000 Subject: [PATCH 55/71] Version bump to TQ1A.220930.002 [core/build_id.mk] Change-Id: If07327aeab0f72f5f0133780b13748f283c78463 --- 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 de2bbb2654..e03de1ab50 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=TQ1A.220930.001 +BUILD_ID=TQ1A.220930.002 From b09ed5f71e726e97647f45c9fcbb24711ce08dc9 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 30 Sep 2022 22:46:34 +0000 Subject: [PATCH 56/71] Version bump to TQ1A.220930.003 [core/build_id.mk] Change-Id: If6c0462842855c16df2c38c54d2bf2709c5cfc51 --- 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 e03de1ab50..256ad2dff5 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=TQ1A.220930.002 +BUILD_ID=TQ1A.220930.003 From 6450de282bbe92a2e3b2f41e9f09a6eb27084154 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 4 Oct 2022 01:56:38 +0000 Subject: [PATCH 57/71] Version bump to TQ1A.221003.002 [core/build_id.mk] Change-Id: Ie337837d6e032b855094c016cc954069d16ec60c --- 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 dbf506e046..7567960a40 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=TQ1A.221003.001 +BUILD_ID=TQ1A.221003.002 From e2c7b987bdb42a5b35ce0799690e28bb5fcc3123 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 5 Oct 2022 00:17:28 +0000 Subject: [PATCH 58/71] Version bump to TQ1A.221003.003 [core/build_id.mk] Change-Id: I139d63e513f9f840a027efeb66f7a29b657f4e1c --- 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 7567960a40..49d8a8cd7e 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=TQ1A.221003.002 +BUILD_ID=TQ1A.221003.003 From 5b37f0f6db133daa0f514925556dad1c3e887962 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 5 Oct 2022 19:06:56 +0000 Subject: [PATCH 59/71] Version bump to TQ1A.221003.004 [core/build_id.mk] Change-Id: I9da01103aa19190da002109578cc59e851370d16 --- 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 49d8a8cd7e..929d9020f0 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=TQ1A.221003.003 +BUILD_ID=TQ1A.221003.004 From 687ff4f18207d930653ce6ef8a38e721240eb292 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 6 Oct 2022 04:34:27 +0000 Subject: [PATCH 60/71] Version bump to TQ1A.221003.005 [core/build_id.mk] Change-Id: I5c467d42eb6a64b60593165df9a406be45143927 --- 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 929d9020f0..862ccbb748 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=TQ1A.221003.004 +BUILD_ID=TQ1A.221003.005 From 93235f50dceaaeaa93a0e544b6d8fdd33523eb67 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 7 Oct 2022 18:38:55 +0000 Subject: [PATCH 61/71] Version bump to TQ1A.221003.006 [core/build_id.mk] Change-Id: If147df3a2edecc30d07a5185700a538e59f70d01 --- 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 862ccbb748..d8a5fe7f06 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=TQ1A.221003.005 +BUILD_ID=TQ1A.221003.006 From 9ecc383ff9677c60309c24d6d4d3ccfbcb5f0e55 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 4 Oct 2022 18:44:47 +0000 Subject: [PATCH 62/71] Update Security String to 2022-12-05 Bug: 250644806 Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442 (cherry picked from commit a12157186b0de7ef1077f527af1dbf842610c601) 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..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 9a1d697d85cdf617cf0252d8d1162f4bb085f7fc Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 10 Oct 2022 23:02:03 +0000 Subject: [PATCH 63/71] Version bump to TQ1A.221205.002 [core/build_id.mk] Change-Id: I1089f592694cb63c4364c1d2e09182642a955433 --- 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 f0a40a2a92..cde5bb6927 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=TQ1A.221205.001 +BUILD_ID=TQ1A.221205.002 From a1df2bf65d903aab3b5b3caf65cdcfb546bb3095 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 12 Oct 2022 19:48:38 +0000 Subject: [PATCH 64/71] Version bump to TQ1A.221205.003 [core/build_id.mk] Change-Id: I1f7740041567db67f271e94d1e35ef8db200bac1 --- 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 cde5bb6927..16c5b2a0ec 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=TQ1A.221205.002 +BUILD_ID=TQ1A.221205.003 From 718febbeebe96291260ed1a838c90f4c178f10eb Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 15 Oct 2022 01:18:23 +0000 Subject: [PATCH 65/71] Version bump to TQ1A.221205.004 [core/build_id.mk] Change-Id: Ib1fa1c9e2fd970de343451ca691702adc4b68cb9 --- 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 16c5b2a0ec..8840d11ff0 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=TQ1A.221205.003 +BUILD_ID=TQ1A.221205.004 From b48e82fde413525d83ce9bce63ac7440ab84f5e6 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 19 Oct 2022 23:20:16 +0000 Subject: [PATCH 66/71] Version bump to TQ1A.221205.005 [core/build_id.mk] Change-Id: I3f45f40b40dada31d60d2da2619522c622c5761a --- 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 8840d11ff0..9f397dd78f 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=TQ1A.221205.004 +BUILD_ID=TQ1A.221205.005 From af06769c94b7cd2276d4a856372f07308f83cfec Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 22 Oct 2022 01:11:41 +0000 Subject: [PATCH 67/71] Version bump to TQ1A.221205.006 [core/build_id.mk] Change-Id: Ibd911e947868d81a6935789692f5f55aac2100bf --- 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 9f397dd78f..a19cb4d4bc 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=TQ1A.221205.005 +BUILD_ID=TQ1A.221205.006 From dd1da1e71d2a3a40d7911cc7ffbcdb3ec11a5503 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Thu, 27 Oct 2022 02:14:58 +0000 Subject: [PATCH 68/71] Version bump to TQ1A.221205.007 [core/build_id.mk] Change-Id: I5a16ed3e4c9fd3e7c13bc4f2039cd3d1bb92a59d --- 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 a19cb4d4bc..549a12ac8b 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=TQ1A.221205.006 +BUILD_ID=TQ1A.221205.007 From ef4ff04dfb249a8b8941dc62577bef4972a09b22 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Fri, 28 Oct 2022 18:51:26 +0000 Subject: [PATCH 69/71] Version bump to TQ1A.221205.008 [core/build_id.mk] Change-Id: I3413d722a6eda76e0380f50c8ad0d9486893a87a --- 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 549a12ac8b..448417c8b3 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=TQ1A.221205.007 +BUILD_ID=TQ1A.221205.008 From ac560abb8dbb71f25d2c4cb8cc4f252f16ca333c Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Sat, 29 Oct 2022 02:54:43 +0000 Subject: [PATCH 70/71] Version bump to TQ1A.221205.009 [core/build_id.mk] Change-Id: Ifc6dc74009736277f8aa0991792ac162ec51120c --- 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 448417c8b3..d18583c970 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=TQ1A.221205.008 +BUILD_ID=TQ1A.221205.009 From 7eddea64b8475620b6e83703be67a8bfd71512c6 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Mon, 31 Oct 2022 23:09:31 +0000 Subject: [PATCH 71/71] Version bump to TQ1A.221205.010 [core/build_id.mk] Change-Id: Iaf249517d7a059babecb51990c75f5f3f1c80d9d --- 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 d18583c970..036fe0379f 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=TQ1A.221205.009 +BUILD_ID=TQ1A.221205.010