P: do not mandate LMK for O/O-MR1 launches
Userspace lmkd can be enabled in Android P, and therefore kernel
lowmemorykiller driver should not be mandated even for devices
launched prior to P.
Bug: 113836751
Change-Id: I274a36010039a57211dc54bb5d3ba58ccf26e057
diff --git a/o-mr1/android-3.18/android-base.cfg b/o-mr1/android-3.18/android-base.cfg
index dd3b963..95ef185 100644
--- a/o-mr1/android-3.18/android-base.cfg
+++ b/o-mr1/android-3.18/android-base.cfg
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o-mr1/android-4.4/android-base.cfg b/o-mr1/android-4.4/android-base.cfg
index 2facdf4..0d3ce24 100644
--- a/o-mr1/android-4.4/android-base.cfg
+++ b/o-mr1/android-4.4/android-base.cfg
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o-mr1/android-4.9/android-base.cfg b/o-mr1/android-4.9/android-base.cfg
index 941ebe2..72e68cb 100644
--- a/o-mr1/android-4.9/android-base.cfg
+++ b/o-mr1/android-4.9/android-base.cfg
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-3.18/android-base.cfg b/o/android-3.18/android-base.cfg
index b133f00..322ebcf 100644
--- a/o/android-3.18/android-base.cfg
+++ b/o/android-3.18/android-base.cfg
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-4.4/android-base.cfg b/o/android-4.4/android-base.cfg
index 35df417..633ed22 100644
--- a/o/android-4.4/android-base.cfg
+++ b/o/android-4.4/android-base.cfg
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-4.9/android-base.cfg b/o/android-4.9/android-base.cfg
index 0195960..14faaab 100644
--- a/o/android-4.9/android-base.cfg
+++ b/o/android-4.9/android-base.cfg
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
