Revert "Add system_ext_userdebug_plat_sepolicy.cil for GSI"
Revert submission 1824717-gsi_debug_policy
Reason for revert: Breaks the build (see b/200933187).
Reverted Changes:
I37ef02628:Add a copy of debug policy to GSI system image
I9c3dad8bb:Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
I43adc6ada:Add system_ext_userdebug_plat_sepolicy.cil for GSI...
I4d6235c73:Add /system_ext/etc/selinux/ to the debug policy s...
Change-Id: I22da171e7b6628cb4c5f28f316ee317fe28761c2
diff --git a/Android.bp b/Android.bp
index a815d9d..4d4fb99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -792,36 +792,6 @@
debug_ramdisk: true,
}
-// A copy of the userdebug_plat_policy in GSI.
-soong_config_module_type {
- name: "gsi_se_policy_cil",
- module_type: "se_policy_cil",
- config_namespace: "ANDROID",
- bool_variables: [
- "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",
- ],
- properties: [
- "enabled",
- "installable",
- ],
-}
-
-gsi_se_policy_cil {
- name: "system_ext_userdebug_plat_sepolicy.cil",
- stem: "userdebug_plat_sepolicy.cil",
- src: ":userdebug_plat_sepolicy.conf",
- additional_cil_files: ["private/technical_debt.cil"],
- system_ext_specific: true,
- enabled: false,
- installable: false,
- soong_config_variables: {
- PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT: {
- enabled: true,
- installable: true,
- },
- },
-}
-
// system_ext_policy.conf - A combination of the private and public system_ext
// policy which will ship with the device. System_ext policy is not attributized
se_policy_conf {
diff --git a/private/file_contexts b/private/file_contexts
index ed972c0..8849602 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -477,7 +477,6 @@
/(system_ext|system/system_ext)/etc/selinux/system_ext_seapp_contexts u:object_r:seapp_contexts_file:s0
/(system_ext|system/system_ext)/etc/selinux/system_ext_service_contexts u:object_r:service_contexts_file:s0
/(system_ext|system/system_ext)/etc/selinux/system_ext_mac_permissions\.xml u:object_r:mac_perms_file:s0
-/(system_ext|system/system_ext)/etc/selinux/userdebug_plat_sepolicy\.cil u:object_r:sepolicy_file:s0
/(system_ext|system/system_ext)/bin/aidl_lazy_test_server u:object_r:aidl_lazy_test_server_exec:s0
/(system_ext|system/system_ext)/bin/aidl_lazy_cb_test_server u:object_r:aidl_lazy_test_server_exec:s0