Snap for 6859431 from f54c051c89928f0a5c8c73c7a0a1c7001da025f0 to android10-tests-releaseandroid10-tests-release

Change-Id: Ic885b5580d6b5ad8e2cd7dd3d02ffeb7658b33c5

12 files changed, 252 insertions, 6 deletions

diff --git a/o-mr1/android-3.18/android-base-conditional.xml b/o-mr1/android-3.18/android-base-conditional.xml
index 9d59127..3630768 100644
--- a/o-mr1/android-3.18/android-base-conditional.xml
+++ b/o-mr1/android-3.18/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="3.18.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o-mr1/android-3.18/android-base.config b/o-mr1/android-3.18/android-base.config
index 1ed2ab5..ca9dcce 100644
--- a/o-mr1/android-3.18/android-base.config
+++ b/o-mr1/android-3.18/android-base.config
@@ -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-conditional.xml b/o-mr1/android-4.4/android-base-conditional.xml
index fda58c3..86564c1 100644
--- a/o-mr1/android-4.4/android-base-conditional.xml
+++ b/o-mr1/android-4.4/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="4.4.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o-mr1/android-4.4/android-base.config b/o-mr1/android-4.4/android-base.config
index 4fb64db..720a3c3 100644
--- a/o-mr1/android-4.4/android-base.config
+++ b/o-mr1/android-4.4/android-base.config
@@ -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-conditional.xml b/o-mr1/android-4.9/android-base-conditional.xml
index b10c0ea..3d2cbf4 100644
--- a/o-mr1/android-4.9/android-base-conditional.xml
+++ b/o-mr1/android-4.9/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="4.9.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o-mr1/android-4.9/android-base.config b/o-mr1/android-4.9/android-base.config
index ded38eb..fc6e5e0 100644
--- a/o-mr1/android-4.9/android-base.config
+++ b/o-mr1/android-4.9/android-base.config
@@ -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-conditional.xml b/o/android-3.18/android-base-conditional.xml
index 9d59127..3630768 100644
--- a/o/android-3.18/android-base-conditional.xml
+++ b/o/android-3.18/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="3.18.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o/android-3.18/android-base.config b/o/android-3.18/android-base.config
index 967fce8..dc8d1d6 100644
--- a/o/android-3.18/android-base.config
+++ b/o/android-3.18/android-base.config
@@ -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-conditional.xml b/o/android-4.4/android-base-conditional.xml
index fda58c3..86564c1 100644
--- a/o/android-4.4/android-base-conditional.xml
+++ b/o/android-4.4/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="4.4.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o/android-4.4/android-base.config b/o/android-4.4/android-base.config
index e7b50ac..315e0db 100644
--- a/o/android-4.4/android-base.config
+++ b/o/android-4.4/android-base.config
@@ -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-conditional.xml b/o/android-4.9/android-base-conditional.xml
index b10c0ea..3d2cbf4 100644
--- a/o/android-4.9/android-base-conditional.xml
+++ b/o/android-4.9/android-base-conditional.xml
@@ -1 +1,43 @@
 <kernel minlts="4.9.0" />
+
+<!-- CONFIG_ANDROID_LOW_MEMORY_KILLER || (CONFIG_MEMCG && CONFIG_MEMCG_SWAP) -->
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_MEMCG</key>
+        <value type="bool">y</value>
+    </config>
+    <config>
+        <key>CONFIG_MEMCG_SWAP</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
+<group>
+    <conditions>
+        <config>
+            <key>CONFIG_MEMCG_SWAP</key>
+            <value type="bool">n</value>
+        </config>
+    </conditions>
+    <config>
+        <key>CONFIG_ANDROID_LOW_MEMORY_KILLER</key>
+        <value type="bool">y</value>
+    </config>
+</group>
diff --git a/o/android-4.9/android-base.config b/o/android-4.9/android-base.config
index b969082..745d76e 100644
--- a/o/android-4.9/android-base.config
+++ b/o/android-4.9/android-base.config
@@ -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