commit 42e732c861be1e7a31a132514677fa21a6a1bc8f
author Yuntao Xu <yuntaoxu@google.com> Thu Nov 18 22:33:02 2021 +0000
committer Inseob Kim <inseob@google.com> Fri Nov 19 18:23:12 2021 +0900
tree 765440e8d95a886e2eb4d8a6a37b45310dfc687d
parent b8f39c49f5ef7f6d8e7ce5d31bb8f010eb16c0c2

Split property/file/service contexts modules

1. Splitted plat_property_contexts, plat_file_contexts, and
plat_service_contexts so 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: I99ba55b1a89f196b3c8504e623b65960a9262165

Android.bp

diff --git a/Android.bp b/Android.bp
index b9c5808..a353831 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 {
@@ -594,7 +618,13 @@
 service_contexts {
     name: "plat_service_contexts",
     srcs: [":service_contexts_files"],
-    recovery_available: true,
+}
+
+service_contexts {
+    name: "plat_service_contexts.recovery",
+    srcs: [":service_contexts_files"],
+    stem: "plat_service_contexts",
+    recovery: true,
 }
 
 service_contexts {
@@ -1195,3 +1225,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",
+}