Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ec66a67 authored by Cody Schuffelen's avatar Cody Schuffelen Committed by Alistair Strachan
Browse files

ANDROID: cuttlefish_defconfig: Enable vsock options 



Bug: 121166534
Test: Ran cuttlefish with android-4.4 + vsock adb tunnel
Signed-off-by: default avatarCody Schuffelen <schuffelen@google.com>
Change-Id: I8168a710052c7daada306a915c56230c961accd4
parent 06477f7e

arch/arm64/configs/cuttlefish_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ CONFIG_NET_CLS_U32=y 
CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y

CONFIG_NET_CLS_ACT=y

CONFIG_VSOCKETS=y

CONFIG_VIRTIO_VSOCKETS=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_DEFAULT_PS is not set

CONFIG_MAC80211=y
@@ -385,6 +387,8 @@ CONFIG_SDCARD_FS=y 
CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_VIRTUALIZATION=y

CONFIG_VHOST_VSOCK=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/x86/configs/x86_64_cuttlefish_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ CONFIG_NET_CLS_U32=y 
CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y

CONFIG_NET_CLS_ACT=y

CONFIG_VSOCKETS=y

CONFIG_VIRTIO_VSOCKETS=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_RFKILL=y
@@ -459,3 +461,4 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y 
CONFIG_X509_CERTIFICATE_PARSER=y

CONFIG_SYSTEM_TRUSTED_KEYRING=y

CONFIG_SYSTEM_TRUSTED_KEYS="verity_dev_keys.x509"

CONFIG_VHOST_VSOCK=y