Revert "Split property and file contexts modules"
Revert "Convert security/Android.mk to Android.bp"
Revert "Add seapp_contexts to allowlist of makefile goal"
Revert submission 1795972-Convert security/Android.mk to Android.bp
Reason for revert: http://b/206976319 Broken build 7928060 on aosp-master on sdk_arm64-sdk
Reverted Changes:
I0e0e7f677:Split property and file contexts modules
I5596d6f00:Add seapp_contexts to allowlist of makefile goal
If685e5ccc:Convert security/Android.mk to Android.bp
Change-Id: Ibbca0a17886d15b3fd7ecaf974a06df7107fd9aa
diff --git a/Android.bp b/Android.bp
index 61bd4c9..e517356 100644
--- a/Android.bp
+++ b/Android.bp
@@ -494,26 +494,8 @@
flatten_apex: {
srcs: ["apex/*-file_contexts"],
},
-}
-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,
+ recovery_available: true,
}
file_contexts {
@@ -577,13 +559,7 @@
property_contexts {
name: "plat_property_contexts",
srcs: [":property_contexts_files"],
-}
-
-property_contexts {
- name: "plat_property_contexts.recovery",
- srcs: [":property_contexts_files"],
- stem: "plat_property_contexts",
- recovery: true,
+ recovery_available: true,
}
property_contexts {
@@ -1188,17 +1164,3 @@
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",
-}