summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-09-27 11:05:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-09-27 11:05:19 +0000
commit2c8d7798cd0c1fb85e8f5dc2bfbdac98b2c4183f (patch)
tree37c93947968adc08d013e9a428599d385c5ff160
parentb7aced88d6ee1cbf9b9bd19756bb0616e88aa3c7 (diff)
parentd416dae3472166b2db93d0bceda85918cc09d322 (diff)
Merge "Add more sepolicy variables to soong_config"
-rw-r--r--core/soong_config.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 9eb02b294a..d09f0c2992 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -202,6 +202,7 @@ $(call add_json_list, BoardSepolicyM4Defs, $(BOARD_SEPOLICY_M4DEFS
$(call add_json_str, BoardSepolicyVers, $(BOARD_SEPOLICY_VERS))
$(call add_json_str, PlatformSepolicyVersion, $(PLATFORM_SEPOLICY_VERSION))
+$(call add_json_str, TotSepolicyVersion, $(TOT_SEPOLICY_VERSION))
$(call add_json_bool, Flatten_apex, $(filter true,$(TARGET_FLATTEN_APEX)))
$(call add_json_bool, ForceApexSymlinkOptimization, $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION)))
@@ -268,6 +269,9 @@ $(call add_json_bool, SelinuxIgnoreNeverallows, $(filter true,$(SELINUX_IGNORE_N
$(call add_json_bool, SepolicySplit, $(filter true,$(PRODUCT_SEPOLICY_SPLIT)))
+$(call add_json_list, SepolicyFreezeTestExtraDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_DIRS))
+$(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_PREBUILT_DIRS))
+
$(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents))