Correctly handle line markers
For better debuggability upon neverallow violations, this change leaves
line markers as-is.
* build_sepolicy filter_out tool leaves line markers as-is. It may cause
markers to be redundant, so it also cleans up such markers.
* remove_line_marker property is removed as it is not needed.
* fixed odm_sepolicy.cil filtering.
Bug: 400544895
Test: check sepolicy artifacts
Change-Id: I793ffe728488422fc31de2705889869b2ea7d050
diff --git a/Android.bp b/Android.bp
index 44f064e..15d1596 100644
--- a/Android.bp
+++ b/Android.bp
@@ -335,7 +335,6 @@
src: ":system_ext_sepolicy.conf",
system_ext_specific: true,
filter_out: [":plat_sepolicy.cil"],
- remove_line_marker: true,
}
// product_policy.conf - A combination of the private and public product policy
@@ -361,7 +360,6 @@
":plat_sepolicy.cil",
":system_ext_sepolicy.cil",
],
- remove_line_marker: true,
}
// policy mapping files
@@ -477,7 +475,7 @@
src: ":odm_sepolicy.conf",
filter_out: [
":reqd_policy_mask.cil",
- ":vendor_sepolicy.cil",
+ ":vendor_sepolicy.cil.raw",
],
secilc_check: false, // will be done in se_versioned_policy module
device_specific: true,
@@ -497,10 +495,7 @@
":plat_mapping_file",
":vendor_sepolicy.cil",
],
- filter_out: [
- ":plat_pub_versioned.cil",
- ":vendor_sepolicy.cil",
- ],
+ filter_out: [":plat_pub_versioned.cil"],
device_specific: true,
}