commit 38fd5650ea03b1f47ead2a12a655298ef2f70a91
author Nick Kralevich <nnk@google.com> Tue Jun 03 16:39:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 03 16:39:51 2014 +0000
tree 576997c9cd8963eb46dd4befff19c3cabbcb6b41
parent 7cf8e1cb88c44963ccb2128113d8a804d85645b9
parent 82015d4f127219700992f8800118fd9c388e3c99

am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"

* commit '82015d4f127219700992f8800118fd9c388e3c99':
  Only allow disabling SELinux on userdebug / eng builds

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 15a23be..489dc93 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -25,7 +25,7 @@
 endif
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1
+LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_DISABLE_SELINUX=1
 endif
 
 # Enable ueventd logging

init/init.c

diff --git a/init/init.c b/init/init.c
index 7ba25dc..c79929b 100644
--- a/init/init.c
+++ b/init/init.c
@@ -868,6 +868,7 @@
 
 static bool selinux_is_disabled(void)
 {
+#ifdef ALLOW_DISABLE_SELINUX
     char tmp[PROP_VALUE_MAX];
 
     if (access("/sys/fs/selinux", F_OK) != 0) {
@@ -881,12 +882,14 @@
         /* SELinux is compiled into the kernel, but we've been told to disable it. */
         return true;
     }
+#endif
 
     return false;
 }
 
 static bool selinux_is_enforcing(void)
 {
+#ifdef ALLOW_DISABLE_SELINUX
     char tmp[PROP_VALUE_MAX];
 
     if (property_get("ro.boot.selinux", tmp) == 0) {
@@ -903,6 +906,7 @@
         ERROR("SELinux: Unknown value of ro.boot.selinux. Got: \"%s\". Assuming enforcing.\n", tmp);
     }
 
+#endif
     return true;
 }