ANDROID: GKI: Convert TIPC to gki modules

Converts following networking features to modules: CONFIG_TIPC: The Transparent Inter Process Communication (TIPC) protocol. CONFIG_TIPC_DIAG: TIPC: socket monitoring interface Bug: 232431151 Test: TH Change-Id: I370cc7a34f67222b619107d773cc4a13edd6b538 Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-11-14 22:33:29 +00:00
parent 2c8b3eb2cf
commit e516a098e2
5 changed files with 8 additions and 2 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -42,6 +42,8 @@ _common_gki_modules_list = [
    "net/can/can-gw.ko",
    "net/can/can-raw.ko",
    "net/mac80211/mac80211.ko",
+    "net/tipc/diag.ko",
+    "net/tipc/tipc.ko",
    "net/wireless/cfg80211.ko",
 ]

--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -11,3 +11,5 @@ net/can/can-bcm.ko
 net/can/can-gw.ko
 net/wireless/cfg80211.ko
 net/mac80211/mac80211.ko
+net/tipc/tipc.ko
+net/tipc/diag.ko
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -10,5 +10,7 @@ net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko
 net/mac80211/mac80211.ko
+net/tipc/diag.ko
+net/tipc/tipc.ko
 net/wireless/cfg80211.ko

--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -230,7 +230,7 @@ CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
-CONFIG_TIPC=y
+CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -211,7 +211,7 @@ CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
-CONFIG_TIPC=y
+CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y