Split property and file contexts modules
1. Splitted plat_property_contexts and plat_file_contexts so that they
can be included by the CtsSecurityHostTestCases module;
2. Add temporary seapp_contexts Soong module, which are needed by the
CtsSecurityHostTestCases, and makefile_goal is an interim solution before
migrating both of them to Soong.
Bug: 194096505
Test: m CtsSecurityHostTestCases
Change-Id: I0e0e7f6778d42ab2fdae3a181f40216fe6719e7c
diff --git a/Android.bp b/Android.bp
index e517356..61bd4c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -494,8 +494,26 @@
flatten_apex: {
srcs: ["apex/*-file_contexts"],
},
+}
- recovery_available: true,
+file_contexts {
+ name: "plat_file_contexts.recovery",
+ srcs: [":file_contexts_files"],
+ stem: "plat_file_contexts",
+ product_variables: {
+ address_sanitize: {
+ srcs: [":file_contexts_asan_files"],
+ },
+ debuggable: {
+ srcs: [":file_contexts_overlayfs_files"],
+ },
+ },
+
+ flatten_apex: {
+ srcs: ["apex/*-file_contexts"],
+ },
+
+ recovery: true,
}
file_contexts {
@@ -559,7 +577,13 @@
property_contexts {
name: "plat_property_contexts",
srcs: [":property_contexts_files"],
- recovery_available: true,
+}
+
+property_contexts {
+ name: "plat_property_contexts.recovery",
+ srcs: [":property_contexts_files"],
+ stem: "plat_property_contexts",
+ recovery: true,
}
property_contexts {
@@ -1164,3 +1188,17 @@
se_freeze_test {
name: "sepolicy_freeze_test",
}
+
+//////////////////////////////////
+// Makefile rules temporary imported to Soong
+// TODO(b/33691272): remove these after migrating seapp to Soong
+//////////////////////////////////
+makefile_goal {
+ name: "plat_seapp_contexts_rule",
+ product_out_path: "obj/ETC/plat_seapp_contexts_intermediates/plat_seapp_contexts",
+}
+
+makefile_goal {
+ name: "plat_seapp_neverallows_rule",
+ product_out_path: "obj/ETC/plat_seapp_neverallows_intermediates/plat_seapp_neverallows",
+}