commit a97985d801ad8c0dba8882c798236d54d57f24f3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 19 00:01:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 00:01:33 2024 +0000
tree 20cc3b88dae3c34b231723d2e336acc8b6974d70
parent 7ff2d092910b1741a45eaed8b03e8d560aad70fa
parent c4f8f0f47dbf3ed1905479a54bc335e67243509c

Merge "V: Drop USB gadget config for uevent and accessory from base" into main

v/android-6.1/android-base.config

diff --git a/v/android-6.1/android-base.config b/v/android-6.1/android-base.config
index 333257a..9359ee0 100644
--- a/v/android-6.1/android-base.config
+++ b/v/android-6.1/android-base.config
@@ -247,10 +247,8 @@
 CONFIG_UNIX=y
 CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 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

v/android-6.6/android-base.config

diff --git a/v/android-6.6/android-base.config b/v/android-6.6/android-base.config
index c6ada04..b5edf77 100644
--- a/v/android-6.6/android-base.config
+++ b/v/android-6.6/android-base.config
@@ -247,10 +247,8 @@
 CONFIG_UNIX=y
 CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_SUPPORT=y
 CONFIG_UTS_NS=y