summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-10-11 13:54:41 -0700
committerAmit Pundir <amit.pundir@linaro.org>2017-04-10 13:27:24 +0530
commit9a714c9661a0509c00847b4aaf5d96144e66dbc8 (patch)
tree8eeed613a002ed4af6dc5d26dd89879d0fb4219d /android
parent8be5a2f50dc724ff9b60f4d90778b85106f99f51 (diff)
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 <robh@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> (cherry picked from commit d90ae51a3e7556c9f50431db43cd8190934ccf94) Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-base.cfg1
1 files changed, 1 insertions, 0 deletions
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