Add 30.0 mapping files
Steps taken to produce the mapping files:
1. Add prebuilts/api/30.0/plat_pub_versioned.cil from the
/vendor/etc/selinux/plat_pub_versioned.cil file built on rvc-dev with
lunch target aosp_arm64-eng. Add prebuilts/api/30.0/vendor_sepolicy.cil
as an empty file.
2. Add new file private/compat/30.0/30.0.cil by doing the following:
- copy /system/etc/selinux/mapping/30.0.cil from rvc-dev aosp_arm64-eng
device to private/compat/30.0/30.0.cil
- remove all attribute declaration statement (typeattribute ...) and
sort lines alphabetically
- some selinux types were added/renamed/deleted w.r.t 30 sepolicy.
Find all such types using treble_sepolicy_tests_30.0 test.
- for all these types figure out where to map them by looking at
29.0.[ignore.]cil files and add approprite entries to 30.0.[ignore.]cil.
This change also enables treble_sepolicy_tests_30.0 and installs
30.0.cil mapping file onto the device.
Bug: 153661471
Test: m treble_sepolicy_tests_30.0
Test: m 30.0_compat_test
Test: m selinux_policy
Change-Id: I6dfae41fbd5f245119ede540d2c321688d6e7929
diff --git a/Android.bp b/Android.bp
index a2f202f..dbd52cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,13 @@
}
se_filegroup {
+ name: "30.0.board.compat.map",
+ srcs: [
+ "compat/30.0/30.0.cil",
+ ],
+}
+
+se_filegroup {
name: "26.0.board.ignore.map",
srcs: [
"compat/26.0/26.0.ignore.cil",
@@ -70,6 +77,13 @@
],
}
+se_filegroup {
+ name: "30.0.board.ignore.map",
+ srcs: [
+ "compat/30.0/30.0.ignore.cil",
+ ],
+}
+
se_cil_compat_map {
name: "plat_26.0.cil",
stem: "26.0.cil",
@@ -95,7 +109,14 @@
name: "plat_29.0.cil",
stem: "29.0.cil",
bottom_half: [":29.0.board.compat.map"],
- // top_half: "plat_30.0.cil",
+ top_half: "plat_30.0.cil",
+}
+
+se_cil_compat_map {
+ name: "plat_30.0.cil",
+ stem: "30.0.cil",
+ bottom_half: [":30.0.board.compat.map"],
+ // top_half: "plat_31.0.cil",
}
se_cil_compat_map {
@@ -126,7 +147,15 @@
name: "system_ext_29.0.cil",
stem: "29.0.cil",
bottom_half: [":29.0.board.compat.map"],
- // top_half: "system_ext_30.0.cil",
+ top_half: "system_ext_30.0.cil",
+ system_ext_specific: true,
+}
+
+se_cil_compat_map {
+ name: "system_ext_30.0.cil",
+ stem: "30.0.cil",
+ bottom_half: [":30.0.board.compat.map"],
+ // top_half: "system_ext_31.0.cil",
system_ext_specific: true,
}
@@ -158,7 +187,15 @@
name: "product_29.0.cil",
stem: "29.0.cil",
bottom_half: [":29.0.board.compat.map"],
- // top_half: "product_30.0.cil",
+ top_half: "product_30.0.cil",
+ product_specific: true,
+}
+
+se_cil_compat_map {
+ name: "product_30.0.cil",
+ stem: "30.0.cil",
+ bottom_half: [":30.0.board.compat.map"],
+ // top_half: "product_31.0.cil",
product_specific: true,
}
@@ -183,7 +220,13 @@
se_cil_compat_map {
name: "29.0.ignore.cil",
bottom_half: [":29.0.board.ignore.map"],
- // top_half: "30.0.ignore.cil",
+ top_half: "30.0.ignore.cil",
+}
+
+se_cil_compat_map {
+ name: "30.0.ignore.cil",
+ bottom_half: [":30.0.board.ignore.map"],
+ // top_half: "31.0.ignore.cil",
}
prebuilt_etc {
@@ -210,6 +253,12 @@
sub_dir: "selinux/mapping",
}
+prebuilt_etc {
+ name: "30.0.compat.cil",
+ src: "private/compat/30.0/30.0.compat.cil",
+ sub_dir: "selinux/mapping",
+}
+
se_filegroup {
name: "file_contexts_files",
srcs: ["file_contexts"],