openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit '82015d4f127219700992f8800118fd9c388e3c99':
  Only allow disabling SELinux on userdebug / eng builds
This commit is contained in:
Nick Kralevich 2014-06-03 16:39:51 +00:00 committed by Android Git Automerger
parent 7cf8e1cb88 82015d4f12
commit 38fd5650ea
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/Android.mk
View File

@ -25,7 +25,7 @@ LOCAL_CFLAGS += -DBOOTCHART=1
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

4
init/init.c
View File

@ -868,6 +868,7 @@ void selinux_init_all_handles(void)
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 @@ static bool selinux_is_disabled(void)
/* 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 @@ static bool selinux_is_enforcing(void)
ERROR("SELinux: Unknown value of ro.boot.selinux. Got: \"%s\". Assuming enforcing.\n", tmp);
}
#endif
return true;
}