From f3f226ee45d765fe058f490d0151a6bbcd16b320 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 26 Aug 2022 08:33:59 +0800 Subject: [PATCH] Move bt Compatibility matrix to gs-common Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: I5c2428cc42a712b3c416bd62ec6c70c05ea0a82f --- bluetooth/manifest_bluetooth.xml | 56 --------------------- device-cheetah.mk | 73 ++++++++++++---------------- device-cloudripper.mk | 21 +++----- device-panther.mk | 75 +++++++++++++---------------- device-ravenclaw.mk | 19 ++------ device_framework_matrix_product.xml | 10 ---- 6 files changed, 77 insertions(+), 177 deletions(-) delete mode 100644 bluetooth/manifest_bluetooth.xml delete mode 100644 device_framework_matrix_product.xml diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml deleted file mode 100644 index 64238c7..0000000 --- a/bluetooth/manifest_bluetooth.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ext - hwbinder - 1.0 - - IBluetoothExt - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - - - hardware.google.bluetooth.ewp - hwbinder - 1.0 - - IBluetoothEwp - default - - - diff --git a/device-cheetah.mk b/device-cheetah.mk index a8bb6b9..eb5b3d7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk endif @@ -140,12 +139,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-cheetah-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ @@ -153,10 +146,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject @@ -175,6 +164,38 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# Bluetooth AAC VBR +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.a2dp_aac.vbr_supported=true + +# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=262238 +else +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=94 +endif +# Bluetooth LE Audio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=false \ + ro.bluetooth.leaudio_switcher.supported=true + +# Bluetooth EWP test tool +PRODUCT_PACKAGES_DEBUG += \ + ewp_tool +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# Spatial Audio +PRODUCT_PACKAGES += \ + libspatialaudio + # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true @@ -209,10 +230,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/cheetah \ @@ -279,16 +296,6 @@ PRODUCT_PACKAGES += \ SettingsOverlayGE2AE \ SettingsOverlayGP4BC -# Bluetooth LE Audio -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true - -# Bluetooth EWP test tool -PRODUCT_PACKAGES_DEBUG += \ - ewp_tool - # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -307,22 +314,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - -# Bluetooth AAC VBR -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true - -# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 -else -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 -endif - # Keyboard bottom and side padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 65fd3c9..09e7211 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,7 +27,6 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper) @@ -94,18 +93,19 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf + PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Spatial Audio PRODUCT_PACKAGES += \ @@ -142,10 +142,6 @@ PRODUCT_PACKAGES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/cloudripper @@ -178,9 +174,6 @@ endif PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-panther.mk b/device-panther.mk index 213679b..48f570a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,panther) $(call soong_config_set,google3a_config,target_device,panther) @@ -122,13 +121,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-panther-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json -# Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth +# Spatial Audio PRODUCT_PACKAGES += \ - bt_vendor.conf + libspatialaudio + +# Bluetooth HAL PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ @@ -136,10 +133,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject @@ -157,6 +150,35 @@ PRODUCT_COPY_FILES += \ # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ sar_test +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# Bluetooth LE Audio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=false \ + ro.bluetooth.leaudio_switcher.supported=true + +# Bluetooth EWP test tool +PRODUCT_PACKAGES_DEBUG += \ + ewp_tool + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# Bluetooth AAC VBR +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.a2dp_aac.vbr_supported=true + +# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=262238 +else +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=94 +endif # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ @@ -192,10 +214,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/panther \ @@ -267,16 +285,6 @@ PRODUCT_PACKAGES += \ SettingsOverlayGVU6C \ SettingsOverlayGVU6C_VN -# Bluetooth LE Audio -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true - -# Bluetooth EWP test tool -PRODUCT_PACKAGES_DEBUG += \ - ewp_tool - # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -294,23 +302,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=1 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 - -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - -# Bluetooth AAC VBR -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true - -# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 -else -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 -endif - # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index acaa75f..30cb1e9 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -27,7 +27,6 @@ include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) include device/google/gs101/uwb/uwb.mk include device/google/pantah/uwb/uwb_calibration.mk @@ -92,18 +91,17 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -135,10 +133,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/ravenclaw @@ -179,9 +173,6 @@ endif PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml deleted file mode 100644 index 26436bb..0000000 --- a/device_framework_matrix_product.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - hardware.google.bluetooth.ccc - 1.1 - - IBluetoothCcc - default - - -