From 8521d46944fd3e880b4f8ec50e01d0a5f496af23 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Tue, 5 Nov 2013 22:19:33 +0000 Subject: selinux: CM policies are now inserted last Inclusion of the makefile is done by the build system to enforce the wanted order Change-Id: I86d7c6fb08b6bb1f6e0385e951a54827345aaf84 --- config/common.mk | 2 -- sepolicy/sepolicy.mk | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/common.mk b/config/common.mk index 018bad6..53267d4 100644 --- a/config/common.mk +++ b/config/common.mk @@ -296,8 +296,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.cm.version=$(CM_VERSION) \ ro.modversion=$(CM_VERSION) --include vendor/cm/sepolicy/sepolicy.mk - -include vendor/cm-priv/keys/keys.mk -include $(WORKSPACE)/hudson/image-auto-bits.mk diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk index 2defe78..94df225 100644 --- a/sepolicy/sepolicy.mk +++ b/sepolicy/sepolicy.mk @@ -3,8 +3,9 @@ # inherit from CM # -BOARD_SEPOLICY_DIRS := \ +BOARD_SEPOLICY_DIRS += \ vendor/cm/sepolicy -BOARD_SEPOLICY_UNION := \ +BOARD_SEPOLICY_UNION += \ + seapp_contexts \ mac_permissions.xml -- cgit v1.1