summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2014-11-26 03:14:15 +0000
committerSteve Kondik <steve@cyngn.com>2015-10-12 10:08:21 -1000
commit65f0d6592d989aa91d6dab5ead6e5afc5e6a3fc5 (patch)
treeb2a1fe4a078a78135e4f9faea76a0704c9c16c2a /Android.mk
parentf42f25152534a9264412e06c43f86ded60d96407 (diff)
downloadandroid_device_qcom_sepolicy-65f0d6592d989aa91d6dab5ead6e5afc5e6a3fc5.tar.gz
android_device_qcom_sepolicy-65f0d6592d989aa91d6dab5ead6e5afc5e6a3fc5.tar.bz2
android_device_qcom_sepolicy-65f0d6592d989aa91d6dab5ead6e5afc5e6a3fc5.zip
Do not include common SE policies automatically
Automatic additions to BOARD_SEPOLICY_UNION from Android.mk do not guarantee order or precedence of rules. More often than not, these rules get included _after_ the device's own, which makes it impossible for the device to extend them, or even to use types defined here. Manually include these in the device's BoardConfig with "include device/qcom/sepolicy/sepolicy.mk" before its own specific BOARD_SEPOLICY_DIRS (if any) instead. Or just include files piecemeal. Change-Id: I2ce0c3ec325906a46570b26c5f0c2018390d2ec9
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index f7836f66..04c0c181 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,10 @@
-# Board specific SELinux policy variable definitions
-ifeq ($(call is-vendor-board-platform,QCOM),true)
-BOARD_SEPOLICY_DIRS := \
- $(BOARD_SEPOLICY_DIRS) \
- device/qcom/sepolicy \
- device/qcom/sepolicy/common \
- device/qcom/sepolicy/test \
- device/qcom/sepolicy/$(TARGET_BOARD_PLATFORM)
-endif
+# Don't recurse into the platform makefiles. We don't care about them, and
+# we don't want to force a reset of BOARD_SEPOLICY_DIRS
+#
+# If you want to use these policies, add a
+#
+# include device/qcom/sepolicy/sepolicy.mk
+#
+# to your device's BoardConfig. It is highly recommended that in case
+# you have your own BOARD_SEPOLICY_DIRS and BOARD_SEPOLICY_UNION declarations,
+# the inclusion happens _before_ those lines