Use user variant for vintf finalization
Bug: 389524798
Test: see the child change
Change-Id: I5d4575c19681218460d8a721beadadc8034507f9
diff --git a/Android.bp b/Android.bp
index 24b6fbc..391b125 100644
--- a/Android.bp
+++ b/Android.bp
@@ -256,9 +256,6 @@
name: "plat_sepolicy.cil",
src: ":plat_sepolicy.conf",
additional_cil_files: [":sepolicy_technical_debt{.plat_private}"],
- dist: {
- targets: ["sepolicy_finalize"],
- },
}
// userdebug_plat_policy.conf - the userdebug version plat_sepolicy.cil
@@ -367,9 +364,6 @@
mapping: true,
version: "current",
relative_install_path: "mapping", // install to /system/etc/selinux/mapping
- dist: {
- targets: ["sepolicy_finalize"],
- },
}
se_versioned_policy {
@@ -774,6 +768,9 @@
additional_cil_files: ["private/technical_debt.cil"],
installable: false,
secilc_check: false, // done by se_policy_binary
+ dist: {
+ targets: ["sepolicy_finalize"],
+ },
}
se_policy_binary {
@@ -835,6 +832,18 @@
},
}
+se_versioned_policy {
+ name: "base_plat_mapping_file",
+ base: ":base_plat_pub_policy.cil",
+ mapping: true,
+ version: "current",
+ relative_install_path: "mapping", // install to /system/etc/selinux/mapping
+ dist: {
+ targets: ["sepolicy_finalize"],
+ },
+ installable: false,
+}
+
se_policy_conf {
name: "base_product_pub_policy.conf",
defaults: ["se_policy_conf_flags_defaults"],