Merge "isolate tangorpro from broadcom bt settings"

This commit is contained in:
Adam Shih 2022-09-07 22:59:50 +00:00 committed by Android (Google) Code Review
commit 8f315e822f
7 changed files with 46 additions and 49 deletions

View file

@ -30,5 +30,5 @@ PRODUCT_MODEL := AOSP on Tangorpro
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
DEVICE_MANIFEST_FILE += \
device/google/tangorpro/manifest.xml

View file

@ -0,0 +1,35 @@
<compatibility-matrix version="1.0" type="framework" level="7">
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.bt_channel_avoidance</name>
<version>1.0</version>
<interface>
<name>IBTChannelAvoidance</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.sar</name>
<version>1.1</version>
<interface>
<name>IBluetoothSar</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.ext</name>
<version>1.0</version>
<interface>
<name>IBluetoothExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.ccc</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
</compatibility-matrix>

View file

@ -35,4 +35,13 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ext</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothExt</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View file

@ -17,6 +17,7 @@
# Bluetooth HAL and Pixel extension
DEVICE_MANIFEST_FILE += \
device/google/tangorpro/bluetooth/manifest_bluetooth.xml
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/bluetooth/device_framework_matrix_product.xml
BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/bluetooth
PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux
# Bluetooth SAR test tools

View file

@ -44,7 +44,6 @@ USE_TABLET_BT_COD := true
include device/google/tangorpro/audio/tangorpro/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
$(call soong_config_set,lyric,tuning_product,cloudripper)
$(call soong_config_set,google3a_config,target_device,cloudripper)

View file

@ -1,11 +0,0 @@
<compatibility-matrix version="1.0" type="framework" level="7">
<hal format="hidl">
<name>hardware.google.bluetooth.ccc</name>
<version>1.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
</compatibility-matrix>

View file

@ -84,15 +84,6 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.bluetooth</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IBluetoothHci</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.bluetooth.audio</name>
<transport>hwbinder</transport>
@ -131,33 +122,6 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.bt_channel_avoidance</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBTChannelAvoidance</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.sar</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IBluetoothSar</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ccc</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>