commit 9d8bb70886d5f70120a8477d28d08b1d3061795c
author Alistair Strachan <astrachan@google.com> Sun Apr 08 21:58:45 2018 -0700
committer Alistair Strachan <astrachan@google.com> Mon Apr 09 17:25:57 2018 +0000
tree 6e333aba4f190ed9e5a38d339ddd9fb1f5c704e4
parent d589b2ba94682f9140920e33779afd0085651d2a

android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement.

On older kernels it was ambiguous whether
CONFIG_ANDROID_LOW_MEMORY_KILLER or CONFIG_MEMCG should be enabled, but
on 4.14 there is no lmk driver so we rely on CONFIG_MEMCG.

Bug: 77736601
Change-Id: Iff24ac4ec903054cb2a9b858c09f01caeffc6d22
Signed-off-by: Alistair Strachan <astrachan@google.com>

android-4.14/android-base.cfg

diff --git a/android-4.14/android-base.cfg b/android-4.14/android-base.cfg
index 1aa739c..e9d374e 100644
--- a/android-4.14/android-base.cfg
+++ b/android-4.14/android-base.cfg
@@ -63,6 +63,8 @@
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y