ANDROID: GKI: Convert CAN Bus Subsystem as module

Sets CONFIG_CAN=m to conver CAN Bus subsystem as
GKI module.

Bug: 232431151
Test: TH
Change-Id: Ia90fcc7a30edb994a8e47dea617050836356729d
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>

android/gki_aarch64_modules

@@ -10,12 +10,13 @@ drivers/bluetooth/hci_uart.ko
 drivers/bluetooth/btsdio.ko
 drivers/bluetooth/btbcm.ko
 drivers/bluetooth/btqca.ko
-net/can/can-raw.ko
-net/can/can-bcm.ko
-net/can/can-gw.ko
 net/8021q/8021q.ko
 net/wireless/cfg80211.ko
 net/ieee802154/6lowpan/ieee802154_6lowpan.ko
+net/can/can.ko
+net/can/can-raw.ko
+net/can/can-bcm.ko
+net/can/can-gw.ko
 net/bluetooth/bluetooth.ko
 net/bluetooth/rfcomm/rfcomm.ko
 net/bluetooth/hidp/hidp.ko

android/gki_system_dlkm_modules

@@ -22,6 +22,7 @@ net/8021q/8021q.ko
 net/bluetooth/bluetooth.ko
 net/bluetooth/hidp/hidp.ko
 net/bluetooth/rfcomm/rfcomm.ko
+net/can/can.ko
 net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko

arch/arm64/configs/gki_defconfig

@@ -271,13 +271,9 @@ CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CAN=y
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
+CONFIG_CAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y

arch/x86/configs/gki_defconfig

@@ -252,13 +252,9 @@ CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CAN=y
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
+CONFIG_CAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y

modules.bzl

@@ -24,6 +24,7 @@ COMMON_GKI_MODULES_LIST = [
     "net/bluetooth/bluetooth.ko",
     "net/bluetooth/hidp/hidp.ko",
     "net/bluetooth/rfcomm/rfcomm.ko",
+    "net/can/can.ko",
     "net/can/can-bcm.ko",
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",