commit 15b3ceda5cd0fea1f0b5b19d4795d7290a75b39d
author William Roberts <w.roberts@sta.samsung.com> Tue Feb 12 13:30:47 2013 +0900
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 21 02:55:49 2013 +0000
tree 9f2f687d389699eb0f67fdf5398b5e57b659f170
parent acea73d5dc42c4475f4f474343041765b558c5d4

Add BOARD_SEPOLICY_IGNORE

See README for further details.

Change-Id: I4599c7ecd5a552e38de89d0a9e496e047068fe05

Android.mk

diff --git a/Android.mk b/Android.mk
index 44c1ef6..aad5451 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,8 @@
     $(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 @@
 # 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), \
+      ) \
     ) \
   ) \
 )