diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:58:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:58:48 +0000 |
| commit | 199cd7d2de60a2563f0cd44b8cb6d1264de7f78f (patch) | |
| tree | 716d5d27bb95ad897598dd58ea1d97543be66387 | |
| parent | 5a8800571a081319a234f8223efe9783b145bbad (diff) | |
| parent | db73f37e83f63abccf143d2bac157e214a57848f (diff) | |
Merge "db845c: Wire in bluetooth support" am: 9d2903b236 am: ecfd42d2f4 am: db73f37e83
Change-Id: I9ef92509919fe0b44103560f2061a937fb0ed3e6
| -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 1375db4..897f183 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> |