Merge "Refactor selinux_policy_nonsystem to separate phonies for vendor/odm" into main
diff --git a/Android.bp b/Android.bp
index f68e7fa..db1ea27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1046,6 +1046,18 @@
phony {
name: "selinux_policy_nonsystem",
required: [
+ "selinux_policy_system_ext",
+ "selinux_policy_product",
+ "selinux_policy_vendor",
+ "selinux_policy_odm",
+ // Builds an additional userdebug sepolicy into the debug ramdisk.
+ "userdebug_plat_sepolicy.cil",
+ ],
+}
+
+phony {
+ name: "selinux_policy_vendor",
+ required: [
"plat_pub_versioned.cil",
"vendor_sepolicy.cil",
"plat_sepolicy_vers.txt",
@@ -1063,6 +1075,13 @@
"vendor_bug_map",
"vndservice_contexts",
"vndservice_contexts_test",
+ ],
+ vendor: true,
+}
+
+phony {
+ name: "selinux_policy_odm",
+ required: [
"odm_sepolicy.cil",
"odm_file_contexts",
"odm_file_contexts_test",
@@ -1074,10 +1093,6 @@
"odm_hwservice_contexts",
"odm_hwservice_contexts_test",
"odm_mac_permissions.xml",
- "selinux_policy_system_ext",
- "selinux_policy_product",
- // Builds an additional userdebug sepolicy into the debug ramdisk.
- "userdebug_plat_sepolicy.cil",
] + select(soong_config_variable("ANDROID", "PRODUCT_PRECOMPILED_SEPOLICY"), {
true: [
"precompiled_sepolicy",
@@ -1087,7 +1102,7 @@
],
default: [],
}),
- vendor: true,
+ device_specific: true,
}
phony {