summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2013-06-07 15:23:31 -0700
committerArve Hjønnevåg <arve@android.com>2013-07-01 14:16:27 -0700
commit90a3b1e8f9a9ce6339cea2eef7703eaf450a4c80 (patch)
treed47738c65f712fcf0c863c3831f0e941af935dab /android
parentf4bcdc94a951061383d784d63fa5f80171a899fd (diff)
android: configs: no MODULES for base, no SIP for recommended
We don't like CONFIG_MODULES anymore. Connection tracker handling of large SIP fails. Change-Id: Ie3c65aefcc6181752d6656c97e63035e5b5653ff Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-base.cfg1
-rw-r--r--android/configs/android-recommended.cfg1
2 files changed, 2 insertions, 0 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 1969f30c0f79..2b98436550cf 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -1,4 +1,5 @@
# CONFIG_INET_LRO is not set
+# CONFIG_MODULES is not set
# CONFIG_OABI_COMPAT is not set
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y
diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg
index 175f7c2c1877..ca3cc8613366 100644
--- a/android/configs/android-recommended.cfg
+++ b/android/configs/android-recommended.cfg
@@ -5,6 +5,7 @@ CONFIG_COMPACTION=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_ANDROID_RAM_CONSOLE=y