diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-26 03:14:15 +0000 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-12 10:08:21 -1000 |
| commit | 65f0d6592d989aa91d6dab5ead6e5afc5e6a3fc5 (patch) | |
| tree | b2a1fe4a078a78135e4f9faea76a0704c9c16c2a | |
| parent | f42f25152534a9264412e06c43f86ded60d96407 (diff) | |
| download | android_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
| -rw-r--r-- | Android.mk | 19 | ||||
| -rw-r--r-- | sepolicy.mk | 7 |
2 files changed, 17 insertions, 9 deletions
@@ -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 diff --git a/sepolicy.mk b/sepolicy.mk new file mode 100644 index 00000000..6d2f31d1 --- /dev/null +++ b/sepolicy.mk @@ -0,0 +1,7 @@ +# Board specific SELinux policy variable definitions +BOARD_SEPOLICY_DIRS := \ + $(BOARD_SEPOLICY_DIRS) \ + device/qcom/sepolicy \ + device/qcom/sepolicy/common \ + device/qcom/sepolicy/test \ + device/qcom/sepolicy/$(TARGET_BOARD_PLATFORM) |