aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorWilliam Roberts <w.roberts@sta.samsung.com>2013-02-12 13:30:47 +0900
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-03-21 02:55:49 +0000
commit15b3ceda5cd0fea1f0b5b19d4795d7290a75b39d (patch)
tree9f2f687d389699eb0f67fdf5398b5e57b659f170 /Android.mk
parentacea73d5dc42c4475f4f474343041765b558c5d4 (diff)
downloadandroid_external_sepolicy-15b3ceda5cd0fea1f0b5b19d4795d7290a75b39d.tar.gz
android_external_sepolicy-15b3ceda5cd0fea1f0b5b19d4795d7290a75b39d.tar.bz2
android_external_sepolicy-15b3ceda5cd0fea1f0b5b19d4795d7290a75b39d.zip
Add BOARD_SEPOLICY_IGNORE
See README for further details. Change-Id: I4599c7ecd5a552e38de89d0a9e496e047068fe05
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk21
1 files changed, 12 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 44c1ef6..aad5451 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,8 @@ $(foreach pf, $(BOARD_SEPOLICY_REPLACE), \
$(error Ambiguous request for sepolicy $(pf). Appears in both \
BOARD_SEPOLICY_REPLACE and BOARD_SEPOLICY_UNION), \
) \
- $(eval _paths := $(wildcard $(addsuffix /$(pf), $(BOARD_SEPOLICY_DIRS)))) \
+ $(eval _paths := $(filter-out $(BOARD_SEPOLICY_IGNORE), \
+ $(wildcard $(addsuffix /$(pf), $(BOARD_SEPOLICY_DIRS))))) \
$(eval _occurrences := $(words $(_paths))) \
$(if $(filter 0,$(_occurrences)), \
$(error No sepolicy file found for $(pf) in $(BOARD_SEPOLICY_DIRS)), \
@@ -45,15 +46,17 @@ $(foreach pf, $(BOARD_SEPOLICY_REPLACE), \
# product variables.
# $(1): the set of policy name paths to build
build_policy = $(foreach type, $(1), \
- $(foreach expanded_type, $(notdir $(wildcard $(addsuffix /$(type), $(LOCAL_PATH)))), \
- $(if $(filter $(expanded_type), $(BOARD_SEPOLICY_REPLACE)), \
- $(wildcard $(addsuffix $(expanded_type), $(sort $(dir $(sepolicy_replace_paths))))), \
- $(LOCAL_PATH)/$(expanded_type) \
+ $(filter-out $(BOARD_SEPOLICY_IGNORE), \
+ $(foreach expanded_type, $(notdir $(wildcard $(addsuffix /$(type), $(LOCAL_PATH)))), \
+ $(if $(filter $(expanded_type), $(BOARD_SEPOLICY_REPLACE)), \
+ $(wildcard $(addsuffix $(expanded_type), $(sort $(dir $(sepolicy_replace_paths))))), \
+ $(LOCAL_PATH)/$(expanded_type) \
+ ) \
) \
- ) \
- $(foreach union_policy, $(wildcard $(addsuffix /$(type), $(BOARD_SEPOLICY_DIRS))), \
- $(if $(filter $(notdir $(union_policy)), $(BOARD_SEPOLICY_UNION)), \
- $(union_policy), \
+ $(foreach union_policy, $(wildcard $(addsuffix /$(type), $(BOARD_SEPOLICY_DIRS))), \
+ $(if $(filter $(notdir $(union_policy)), $(BOARD_SEPOLICY_UNION)), \
+ $(union_policy), \
+ ) \
) \
) \
)