From d9fc654578ff0265bd3a29b7bae6387653bab870 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 27 Feb 2024 16:48:05 +0800 Subject: [PATCH 1/2] Initial Bootloader prebuilt for AP3% build Bug: 326002225 Change-Id: I2ee8eef6d76ad14f544a04bfba060f6b77ad4303 --- device-felix.mk | 2 +- felix/BoardConfig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index e2489f4..447d3e8 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -266,7 +266,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 1aaac33..a1ed5db 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -23,7 +23,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk From 6438a6b0b50fabf45ef3d2310e29a06fcb7e27fe Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Thu, 29 Feb 2024 08:32:10 +0000 Subject: [PATCH 2/2] Revert "Extend LE Audio allow list candidate device" This reverts commit 6d85c6b9972f4473e6fea7b2d730600fb3909e61. Reason for revert: no in plan for 24Q2 Bug: 327554841 Test: build Change-Id: I090aba7e994ffb31738a2e330b9c387c7bb52421 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 135051a..e2489f4 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -390,7 +390,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510 # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \