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

Commit da5a022e authored by Alistair Delva's avatar Alistair Delva
Browse files

ANDROID: cuttlefish_defconfig: Enable net testing options 



Required for various networking tests.

Bug: 144061615
Change-Id: I6fe668b17c5e9b1c632542603167c8d27fcec567
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent 1c8f02e0

arch/arm64/configs/cuttlefish_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ CONFIG_CPUSETS=y 
CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_BPF=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -96,7 +95,9 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_NET_IPIP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPGRE=y

CONFIG_NET_IPVTI=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -113,6 +114,7 @@ CONFIG_INET6_ESP=y 
CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_GRE=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y
@@ -236,6 +238,7 @@ CONFIG_DUMMY=y 
CONFIG_NETCONSOLE=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_VIRTIO_NET=y

# CONFIG_ETHERNET is not set

CONFIG_PHYLIB=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ CONFIG_CPUSETS=y 
CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_BPF=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_TUNE=y

CONFIG_BLK_DEV_INITRD=y
@@ -102,7 +101,9 @@ CONFIG_IP_ADVANCED_ROUTER=y 
CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_NET_IPIP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPGRE=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y
@@ -125,6 +126,7 @@ CONFIG_INET6_ESP=y 
CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_GRE=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y
@@ -257,6 +259,7 @@ CONFIG_DUMMY=y 
CONFIG_NETCONSOLE=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_VIRTIO_NET=y

# CONFIG_ETHERNET is not set

CONFIG_PPP=y