Merge "Add new goal for compat file generator"

This commit is contained in:
Treehugger Robot 2022-01-24 01:10:37 +00:00 committed by Gerrit Code Review
commit 4ec796aa2f
2 changed files with 12 additions and 0 deletions

View file

@ -865,6 +865,9 @@ precompiled_se_policy_binary {
"sepolicy_neverallows", "sepolicy_neverallows",
"sepolicy_neverallows_vendor", "sepolicy_neverallows_vendor",
], ],
dist: {
targets: ["base-sepolicy-files-for-mapping"],
},
} }
// policy for recovery // policy for recovery
@ -933,6 +936,9 @@ se_policy_binary {
name: "base_plat_sepolicy", name: "base_plat_sepolicy",
srcs: [":base_plat_sepolicy.cil"], srcs: [":base_plat_sepolicy.cil"],
installable: false, installable: false,
dist: {
targets: ["base-sepolicy-files-for-mapping"],
},
} }
se_policy_conf { se_policy_conf {
@ -1003,6 +1009,9 @@ se_policy_cil {
filter_out: [":reqd_policy_mask.cil"], filter_out: [":reqd_policy_mask.cil"],
secilc_check: false, secilc_check: false,
installable: false, installable: false,
dist: {
targets: ["base-sepolicy-files-for-mapping"],
},
} }
se_policy_conf { se_policy_conf {

View file

@ -85,6 +85,9 @@ $(built_$(version)_plat_sepolicy): $($(version)_plat_policy.conf) $(HOST_OUT_EXE
$(hide) cat $(PRIVATE_ADDITIONAL_CIL_FILES) >> $@ $(hide) cat $(PRIVATE_ADDITIONAL_CIL_FILES) >> $@
$(hide) $(HOST_OUT_EXECUTABLES)/secilc -m -M true -G -c $(POLICYVERS) $(PRIVATE_NEVERALLOW_ARG) $@ -o $@ -f /dev/null $(hide) $(HOST_OUT_EXECUTABLES)/secilc -m -M true -G -c $(POLICYVERS) $(PRIVATE_NEVERALLOW_ARG) $@ -o $@ -f /dev/null
# TODO(b/214336258): move to Soong
$(call dist-for-goals,base-sepolicy-files-for-mapping,$(built_$(version)_plat_sepolicy):$(version)_plat_sepolicy)
$(version)_plat_policy.conf := $(version)_plat_policy.conf :=
# $(version)_compat - the current plat_sepolicy.cil built with the compatibility file # $(version)_compat - the current plat_sepolicy.cil built with the compatibility file