From 56afa3f145ff2d0571f152cee9dba4d5cc8aeeb3 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Tue, 15 Nov 2022 01:14:04 +0000 Subject: [PATCH] ANDROID: GKI: Convert Bluetooth RFCOMM as module CONFIG_BT_RFCOMM: RFCOMM protocol support RFCOMM provides connection oriented stream transport. RFCOMM support is required for Dialup Networking, OBEX and other Bluetooth applications. Bug: 232431151 Test: TH Change-Id: I573d8c7a1eff02b1554b5d6793b5c3c06fb35931 Signed-off-by: Ramji Jiyani (cherry picked from commit 264b55ef9b11bdc59c6164de01e3daf6a44bc95d) --- BUILD.bazel | 1 + android/gki_system_dlkm_modules | 1 + arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 74e037fb2e2a..701972a2c251 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -31,6 +31,7 @@ _common_gki_modules_list = [ "drivers/usb/serial/usbserial.ko", "mm/zsmalloc.ko", "net/8021q/8021q.ko", + "net/bluetooth/rfcomm/rfcomm.ko", "net/can/can-bcm.ko", "net/can/can-gw.ko", "net/can/can-raw.ko", diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 88bb374a0eb8..95a80cdc12f5 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -7,6 +7,7 @@ drivers/usb/serial/ftdi_sio.ko drivers/usb/serial/usbserial.ko mm/zsmalloc.ko net/8021q/8021q.ko +net/bluetooth/rfcomm/rfcomm.ko net/can/can-bcm.ko net/can/can-gw.ko net/can/can-raw.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4555c953b374..4398b5c5074d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -258,7 +258,7 @@ CONFIG_CAN_RAW=m CONFIG_CAN_BCM=m CONFIG_CAN_GW=m CONFIG_BT=y -CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=y CONFIG_BT_HCIBTSDIO=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index e264f2885a26..735d5fac238e 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -248,7 +248,7 @@ CONFIG_CAN_RAW=m CONFIG_CAN_BCM=m CONFIG_CAN_GW=m CONFIG_BT=y -CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=y CONFIG_BT_HCIBTSDIO=y