android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS

TCPMSS is required for the Android Vpn service to correctly
handle the MTU on tun/ppp devices.  Bug: 11579326
We don't really need SCHED_TRACER and the TIMER_STATS.

Change-Id: I10c5767a6324a496713752d4fe9eff361dc8e06a
(cherry picked from commit 23f01e8e81f3c53985958fa291b39c84293ad047)

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 25162024f8896a3eb7dd0a8152b7ee35a0455ec9..a9597658ef14f04484e6ceb649a750b24f8b8c0f 100644 (file)
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -85,6 +85,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NET_CLS_ACT=y

diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg
index b0120f678cc4ab9aea21fd893a37491e4ba747cd..1bd9f6f4b959476f06e28f1e4a36f6a01802b5a6 100644 (file)
--- a/android/configs/android-recommended.cfg
+++ b/android/configs/android-recommended.cfg
@@ -95,7 +95,6 @@ CONFIG_PM_RUNTIME=y
 CONFIG_PM_WAKELOCKS_LIMIT=0
 CONFIG_POWER_SUPPLY=y
 CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_TRACER=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SND=y
 CONFIG_SOUND=y
@@ -106,7 +105,6 @@ CONFIG_TABLET_USB_GTCO=y
 CONFIG_TABLET_USB_HANWANG=y
 CONFIG_TABLET_USB_KBTAB=y
 CONFIG_TABLET_USB_WACOM=y
-CONFIG_TIMER_STATS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UHID=y