commit 5cbfbf4ca7842a9316b80ca95fb219b7a4840dc8
author Inseob Kim <inseob@google.com> Wed Jan 06 05:07:05 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 06 05:07:05 2021 +0000
tree 66c08bd7a38292e0b0e990bf1810e1a4f8ecd0bb
parent bc86b7b2fb9ad5cf668c8fa44d3c85f19774fa38
parent fb7c801b6783e16c3d2dbdb4e50f69ec7f90e4bb

Merge "Support building mixed versions of sepolicy"

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 1d252b7..ac085e2 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -170,6 +170,7 @@
 
 $(call add_json_list, PgoAdditionalProfileDirs,          $(PGO_ADDITIONAL_PROFILE_DIRS))
 
+$(call add_json_list, BoardReqdMaskPolicy,               $(BOARD_REQD_MASK_POLICY))
 $(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, BoardVendorDlkmSepolicyDirs,       $(BOARD_VENDOR_DLKM_SEPOLICY_DIRS))
@@ -178,6 +179,7 @@
 $(call add_json_list, SystemExtPublicSepolicyDirs,       $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS) $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
 $(call add_json_list, SystemExtPrivateSepolicyDirs,      $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS) $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
 $(call add_json_list, BoardSepolicyM4Defs,               $(BOARD_SEPOLICY_M4DEFS))
+$(call add_json_str,  BoardSepolicyVers,                 $(BOARD_SEPOLICY_VERS))
 
 $(call add_json_bool, Flatten_apex,                      $(filter true,$(TARGET_FLATTEN_APEX)))
 $(call add_json_bool, ForceApexSymlinkOptimization,      $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION)))