From: Rob Herring <robh@kernel.org>
Date: Tue, 11 Oct 2016 20:54:41 +0000 (-0700)
Subject: UPSTREAM: config: android: set SELinux as default security mode
X-Git-Tag: release-20171130_firefly~4^2~100^2~166
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9a714c9661a0509c00847b4aaf5d96144e66dbc8;p=firefly-linux-kernel-4.4.55.git

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>
---

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