commit f759824788128461d6cfb121941293c340d950ad
author Ramji Jiyani <ramjiyani@google.com> Fri May 05 00:18:34 2023 +0000
committer Yifan Hong <elsk@google.com> Thu May 18 22:31:38 2023 +0000
tree 92f34b7e9819ddb5737c03df426685b89c38847b
parent 4c83bb13ad03360d80897e1c224b62c14815bb2b

GKI: U: Remove USB NET kernel config requirements

Remove these kernel configs from the android-base.config
as these are converted to GKI modules for android14-* and
later kernels.

CONFIG_USB_NET_AQC111
CONFIG_USB_NET_CDC_NCM

Bug: 279972445
Bug: 280896629
Bug: 283116250
Test: TH
Change-Id: I99f793358bcc99726305ef88ca335fe023233f30
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit ba21d112051535419045b7caba79a030002bb67e)

u/android-5.15/android-base.config

diff --git a/u/android-5.15/android-base.config b/u/android-5.15/android-base.config
index d7459d6..bf4c7e5 100644
--- a/u/android-5.15/android-base.config
+++ b/u/android-5.15/android-base.config
@@ -256,8 +256,6 @@
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_NET_AQC111=y
-CONFIG_USB_NET_CDC_NCM=y
 CONFIG_USB_SUPPORT=y
 CONFIG_UTS_NS=y
 CONFIG_VETH=y

u/android-6.1/android-base.config

diff --git a/u/android-6.1/android-base.config b/u/android-6.1/android-base.config
index 934bee7..f46fd2f 100644
--- a/u/android-6.1/android-base.config
+++ b/u/android-6.1/android-base.config
@@ -254,8 +254,6 @@
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_NET_AQC111=y
-CONFIG_USB_NET_CDC_NCM=y
 CONFIG_USB_SUPPORT=y
 CONFIG_UTS_NS=y
 CONFIG_VETH=y