CONFIG_STATIC_USERMODEHELPER=y required by CTS
Without this, we get the following error:
android.security.cts.KernelConfigTest#testConfigDisableUsermodehelper
fail: junit.framework.AssertionFailedError: Linux kernel must enable
static usermodehelper: CONFIG_STATIC_USERMODEHELPER=y
Test: testConfigDisableUsermodehelper
Bug: 158049874
Bug: 145742407
Change-Id: Iebea5cfc2d986082f8fce76025735b72e4950168
(cherry picked from commit 35a815e562aade5033b20585a14f035a429da5f9)
diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config
index 9f41a24..04b6f5f 100644
--- a/r/android-4.14/android-base.config
+++ b/r/android-4.14/android-base.config
@@ -219,6 +219,7 @@
CONFIG_SND=y
CONFIG_SOUND=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config
index 45b2864..aee6ce0 100644
--- a/r/android-4.19/android-base.config
+++ b/r/android-4.19/android-base.config
@@ -220,6 +220,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config
index a3f7be7..0b1bda2 100644
--- a/r/android-5.4/android-base.config
+++ b/r/android-5.4/android-base.config
@@ -219,6 +219,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
