From 9a714c9661a0509c00847b4aaf5d96144e66dbc8 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 11 Oct 2016 13:54:41 -0700 Subject: UPSTREAM: config: android: set SELinux as default security mode Android won't boot without SELinux enabled, so make it the default. Link: http://lkml.kernel.org/r/20160908185934.18098-2-robh@kernel.org Signed-off-by: Rob Herring Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit d90ae51a3e7556c9f50431db43cd8190934ccf94) Signed-off-by: Greg Kroah-Hartman --- android/configs/android-base.cfg | 1 + 1 file changed, 1 insertion(+) (limited to 'android') diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 59d4908b3343..3672bf339006 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -20,6 +20,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_DEFAULT_SECURITY_SELINUX=y CONFIG_EMBEDDED=y CONFIG_FB=y CONFIG_HARDENED_USERCOPY=y -- cgit v1.2.3