commit 33c3d7c1aa80ef788ef9204b1cc0782fc71bf45a
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 22 22:50:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 22 22:50:59 2018 +0000
tree da68c8cf9b42c2d897fbb9cb20449be2629f3a88
parent 90b890f9f2a6c65352107c838daf94988647e25a
parent 494830879cd63536ba52e420da2da67c487e0462

Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs"

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index ea3714a..3f1fb66 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -143,8 +143,8 @@
 
 $(call add_json_list, BoardVendorSepolicyDirs,           $(BOARD_SEPOLICY_DIRS))
 $(call add_json_list, BoardOdmSepolicyDirs,              $(BOARD_ODM_SEPOLICY_DIRS))
-$(call add_json_str,  BoardPlatPublicSepolicyDir,        $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
-$(call add_json_str,  BoardPlatPrivateSepolicyDir,       $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
+$(call add_json_list, BoardPlatPublicSepolicyDirs,       $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
+$(call add_json_list, BoardPlatPrivateSepolicyDirs,      $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
 
 _contents := $(_contents)    "VendorVars": {$(newline)
 $(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\