diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-05 00:15:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-05 00:15:35 +0000 |
| commit | 9d2903b2368ab6857fc49f846645f0c558551551 (patch) | |
| tree | 659d8e607693a0cc01816a7f015012fc53a0c777 | |
| parent | 4d4e2fb0c180882d753dd898744194e18e035383 (diff) | |
| parent | 59657d5db30d4e274e4a77cd38049e021eb28241 (diff) | |
Merge "db845c: Wire in bluetooth support"
| -rw-r--r-- | db845c.mk | 3 | ||||
| -rw-r--r-- | device-common.mk | 6 | ||||
| -rw-r--r-- | manifest.xml | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -22,6 +22,7 @@ ifeq ($(DB845C_USES_GKI), true) DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko) ifneq ($(DB845C_MODS),) BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS) - BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(DB845C_MODS) + DB845C_ONLY_VENDOR := %/btqca.ko %/hci_uart.ko + BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(DB845C_ONLY_VENDOR),$(DB845C_MODS)) endif endif diff --git a/device-common.mk b/device-common.mk index a35247d..e9372aa 100644 --- a/device-common.mk +++ b/device-common.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ # Enable BT PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.0-service.btlinux + android.hardware.bluetooth@1.1-service.btlinux PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ @@ -94,11 +94,13 @@ PRODUCT_PACKAGES += \ android.hardware.audio@4.0-impl:32 \ android.hardware.audio.effect@4.0-impl:32 \ android.hardware.audio@2.0-service \ - android.hardware.soundtrigger@2.0-impl + android.hardware.soundtrigger@2.0-impl \ + android.hardware.bluetooth.audio@2.0-impl # Build default bluetooth a2dp and usb audio HALs PRODUCT_PACKAGES += \ audio.a2dp.default \ + audio.bluetooth.default \ audio.usb.default \ audio.r_submix.default diff --git a/manifest.xml b/manifest.xml index d2d3477..2342860 100644 --- a/manifest.xml +++ b/manifest.xml @@ -91,7 +91,7 @@ <hal format="hidl"> <name>android.hardware.bluetooth</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.1</version> <interface> <name>IBluetoothHci</name> <instance>default</instance> |