aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill McVicker <willmcvicker@google.com>2023-12-05 16:54:32 -0800
committerWilliam McVicker <willmcvicker@google.com>2023-12-06 01:03:16 +0000
commit2cc1e530a260da3ef5480c87f6a05bba7d22b104 (patch)
tree8e9e65142af5a35c2fca9461c58aeaf3d4a0edd0
parentec7e744031f74675e8816535b6b36f7ef7830efd (diff)
downloadconfigs-2cc1e530a260da3ef5480c87f6a05bba7d22b104.tar.gz
Update v/android-6.6 based on changes since 6.1
* Drop CONFIG_USB_NET_AQ111 and CONFIG_USB_NET_CDC_NCM since these are GKI modules now * Replace CONFIG_EMBEDDED with CONFIG_EXPERT due to commit ef815d2cba78 ("treewide: drop CONFIG_EMBEDDED") Bug: 311450232 Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Ia33e9f64d7cdaa1677ee7d7fa0dd6659c9ff5b09
-rw-r--r--v/android-6.6/android-base.config4
1 files changed, 1 insertions, 3 deletions
diff --git a/v/android-6.6/android-base.config b/v/android-6.6/android-base.config
index 90edb74..23ade49 100644
--- a/v/android-6.6/android-base.config
+++ b/v/android-6.6/android-base.config
@@ -59,9 +59,9 @@ CONFIG_DM_DEFAULT_KEY=y
CONFIG_DM_SNAPSHOT=y
CONFIG_DM_VERITY=y
CONFIG_DUMMY=y
-CONFIG_EMBEDDED=y
CONFIG_EPOLL=y
CONFIG_EVENTFD=y
+CONFIG_EXPERT=y
CONFIG_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
@@ -254,8 +254,6 @@ 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
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
CONFIG_VETH=y