Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move bt Compatibility matrix and some packages to gs-common

Browse source 
Bug: 242661555
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I16baaf6e0ad1ae85138053c26e241fb6101f69ba
This commit is contained in:
Adam Shih 2022-08-26 08:40:39 +08:00
parent 2d842da3f6
commit f20ad73aed
3 changed files with 11 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

38
bluetooth/manifest_bluetooth.xml
View file

@ -1,38 +0,0 @@
<manifest version="1.0" type="device">
<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>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.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

33
device-felix.mk
View file

@ -115,18 +115,23 @@ PRODUCT_COPY_FILES += \
device/google/felix/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
# Bluetooth HAL
DEVICE_MANIFEST_FILE += \
device/google/felix/bluetooth/manifest_bluetooth.xml
PRODUCT_SOONG_NAMESPACES += \
vendor/broadcom/bluetooth
PRODUCT_PACKAGES += \
bt_vendor.conf
PRODUCT_COPY_FILES += \
device/google/felix/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
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
sar_test
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true
# 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
@ -158,10 +163,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/felix/powerstats/felix
@ -183,18 +184,6 @@ FPC_MODULE_TYPE=1542_C
PRODUCT_PROPERTY_OVERRIDES += \
ro.gms.dck.eligible_wcc=2
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
sar_test
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true
# Bluetooth HAL
PRODUCT_PACKAGES += \
bt_vendor.conf
# Graphics
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801152=80

8
device_framework_matrix_product_felix.xml
View file

@ -7,12 +7,4 @@
<instance>secondary</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ccc</name>
<version>1.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
</compatibility-matrix>