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

Move bt Compatibility matrix to gs-common

Browse source 
Bug: 242661555
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I5c2428cc42a712b3c416bd62ec6c70c05ea0a82f
This commit is contained in:
Adam Shih 2022-08-26 08:33:59 +08:00
parent 01ad7b32a6
commit f3f226ee45
6 changed files with 77 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

56
bluetooth/manifest_bluetooth.xml
View file

@ -1,56 +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.ext</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothExt</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>
<hal format="hidl">
<name>hardware.google.bluetooth.ewp</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothEwp</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

73
device-cheetah.mk
View file

@ -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 \

21
device-cloudripper.mk
View file

@ -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

75
device-panther.mk
View file

@ -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 \

19
device-ravenclaw.mk
View file

@ -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

10
device_framework_matrix_product.xml
View file

@ -1,10 +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>