commit 0a92b4fbffaab02575cab3d76a46a44a3940dce9
author Dan Willemsen <dwillemsen@google.com> Tue May 28 19:46:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 28 19:46:07 2019 +0000
tree 23fd57910a8c0e22e02ea450d8bf4decc2dd120f
parent f7d1a97c93a1573505d553d185bd46a6b3b0987b
parent c3cdac6662389fd92d78d704084d4a00f84bdb3f

Merge "soong_config: Include BOARD_VENDOR_SEPOLICY_DIRS"

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 220e2c8..d5140da 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -156,7 +156,7 @@
 
 $(call add_json_list, PgoAdditionalProfileDirs,          $(PGO_ADDITIONAL_PROFILE_DIRS))
 
-$(call add_json_list, BoardVendorSepolicyDirs,           $(BOARD_SEPOLICY_DIRS))
+$(call add_json_list, BoardVendorSepolicyDirs,           $(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_SEPOLICY_DIRS))
 $(call add_json_list, BoardOdmSepolicyDirs,              $(BOARD_ODM_SEPOLICY_DIRS))
 $(call add_json_list, BoardPlatPublicSepolicyDirs,       $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
 $(call add_json_list, BoardPlatPrivateSepolicyDirs,      $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))