Walleye/Taimen: switch to QCOM BT HAL

The flag definition:
BOARD_USES_SDM845_BLUETOOTH_HAL := true

adds SDM845 Bluetooth components to the build:
vendor/qcom/sdm845/proprietary/bluetooth/hidl_transport/Android.mk
vendor/qcom/sdm845/proprietary/bt/hci_qcomm_init/Android.mk

and removes MSM8998 Bluetooth components from the build:
vendor/qcom/msm8998/prebuilts/grease/target/product/msm8998/Android.mk
vendor/qcom/msm8998/proprietary/proprietary/bt/hci_qcomm_init/Android.mk

Effectively, Walleye/Taimen switch to the same QCOM BT HAL as B1/C1.

Bug: 73968979
Test: Manual build and test with BT A2DP headphones

Change-Id: Iddd97a5d3d1369800750e44eb2718d2633c3be78
This commit is contained in:
Petri Gynther
2018-03-02 18:00:19 -08:00
parent c554d5f606
commit 7c2dc1679d
4 changed files with 17 additions and 4 deletions

View File

@@ -89,6 +89,7 @@ TARGET_ANDROID_FILESYSTEM_CONFIG_H := device/google/wahoo/android_filesystem_con
QCOM_BOARD_PLATFORMS += msm8998
BOARD_HAVE_BLUETOOTH_QCOM := true
BOARD_USES_SDM845_BLUETOOTH_HAL := true
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/wahoo/bluetooth
# Camera

View File

@@ -327,10 +327,9 @@ PRODUCT_PACKAGES += \
# Bluetooth HAL
PRODUCT_PACKAGES += \
libbt-vendor \
android.hardware.bluetooth@1.0-impl:64 \
android.hardware.bluetooth@1.0-service \
wcnss_filter
android.hardware.bluetooth@1.0-impl-qti:64 \
android.hardware.bluetooth@1.0-service-qti \
android.hardware.bluetooth@1.0-service-qti.rc
# DRM HAL
PRODUCT_PACKAGES += \

View File

@@ -183,6 +183,7 @@
/vendor/bin/init\.power\.sh u:object_r:init_power_exec:s0
/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0
/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti u:object_r:hal_bluetooth_default_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.0-service\.widevine u:object_r:hal_drm_widevine_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.wahoo u:object_r:hal_vibrator_default_exec:s0

View File

@@ -7,3 +7,15 @@ allow hal_bluetooth fwk_scheduler_hwservice:hwservice_manager find;
allow hal_bluetooth system_server:binder call;
set_prop(hal_bluetooth_default, wc_prop)
userdebug_or_eng(`
allow hal_bluetooth_default diag_device:chr_file rw_file_perms;
allow hal_bluetooth_default ramdump_vendor_data_file:dir w_dir_perms;
allow hal_bluetooth_default ramdump_vendor_data_file:file { create w_file_perms };
allow hal_bluetooth_default sysfs_timestamp_switch:file r_file_perms;
r_dir_file(hal_bluetooth_default, debugfs_ipc)
r_dir_file(hal_bluetooth_default, sysfs_diag)
set_prop(hal_bluetooth_default, ssr_prop)
')
dontaudit hal_bluetooth_default diag_device:chr_file rw_file_perms;