summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-05 22:17:59 +0000
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:27:22 -0700
commit86e6eebd257d588fe3495fbbe4fe5b3d81c50045 (patch)
treebc803ad6921da0968319eee170447e2878058a3e /core
parent18d9fa0557656d2318ffbb7dddf7b4fcf98f5631 (diff)
downloadbuild-86e6eebd257d588fe3495fbbe4fe5b3d81c50045.zip
build-86e6eebd257d588fe3495fbbe4fe5b3d81c50045.tar.gz
build-86e6eebd257d588fe3495fbbe4fe5b3d81c50045.tar.bz2
cm: Fix global selinux policy inclusion
We're adding CM-specific policies to an overlay instead of patching external/sepolicy, so we need to make sure it's included to prevent misbehaving systems Change-Id: I7989a1093f9abc8360d492e73a860eb4afad10ad
Diffstat (limited to 'core')
-rw-r--r--core/config.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk
index 61d8ad7..68d91ce 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -687,4 +687,10 @@ endif
RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20
RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
+ifneq ($(CM_BUILD),)
+## We need to be sure the global selinux policies are included
+## last, to avoid accidental resetting by device configs
+$(eval include vendor/cm/sepolicy/sepolicy.mk)
+endif
+
include $(BUILD_SYSTEM)/dumpvar.mk