commit 792ec60ca3c5501a7a9fbfa8cd4472484935b212
author Tri Vo <trong@google.com> Thu Dec 13 17:41:50 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 13 17:41:50 2018 -0800
tree 32de684bffd6a5615b189eeb7fd1e34cec3155b7
parent 43ecfc554bb1da954b078295fbe1be8e9f2d004b
parent b1525371bcaa96bfb864f952c7f4ae4a9e303457

Merge "Add BOARD_ODM_SEPOLICY_DIRS to neverallow checks." am: c2dbce0604 am: 1a262c9af3
am: b1525371bc

Change-Id: Ied1332fbb8bea634b33622e42de0ce204f7d41b6

Android.mk

diff --git a/Android.mk b/Android.mk
index bb69f06..fcf9d9a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -298,7 +298,8 @@
 $(sepolicy_policy.conf): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS)
 $(sepolicy_policy.conf): PRIVATE_SEPOLICY_SPLIT := $(PRODUCT_SEPOLICY_SPLIT)
 $(sepolicy_policy.conf): $(call build_policy, $(sepolicy_build_files), \
-$(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY) $(PLAT_VENDOR_POLICY) $(BOARD_SEPOLICY_DIRS))
+$(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY) $(PLAT_VENDOR_POLICY) \
+$(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_ODM_SEPOLICY_DIRS))
 	$(transform-policy-to-conf)
 	$(hide) sed '/^\s*dontaudit.*;/d' $@ | sed '/^\s*dontaudit/,/;/d' > $@.dontaudit
 
@@ -314,7 +315,8 @@
 $(sepolicy_policy_2.conf): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS)
 $(sepolicy_policy_2.conf): PRIVATE_SEPOLICY_SPLIT := $(PRODUCT_SEPOLICY_SPLIT)
 $(sepolicy_policy_2.conf): $(call build_policy, $(sepolicy_build_files), \
-$(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY) $(PLAT_VENDOR_POLICY) $(BOARD_SEPOLICY_DIRS))
+$(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY) $(PLAT_VENDOR_POLICY) \
+$(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_ODM_SEPOLICY_DIRS))
 	$(transform-policy-to-conf)
 	$(hide) sed '/^\s*dontaudit.*;/d' $@ | sed '/^\s*dontaudit/,/;/d' > $@.dontaudit