Add 33.0 mapping files
Steps taken to produce the mapping files:
0. Add 33.0 prebuilts to prebuilts/api/33.0/.
1. Add the following Android.bp modules.
33.0.board.compat.map
33.0.board.compat.cil
33.0.board.ignore.map
plat_33.0.cil
system_ext_33.0.cil
product_33.0.cil
33.0.ignore.cil
system_ext_33.0.ignore.cil
product_33.0.ignore.cil
33.0.compat.cil
system_ext_33.0.compat.cil
2. Touch the following three files.
private/compat/33.0/33.0.cil
private/compat/33.0/33.0.compat.cil
private/compat/33.0/33.0.ignore.cil
3. Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS on
build/make/core/config.mk. Note that we don't update
sepolicy_major_vers to 33, but just update compat versions.
4. Run the following command.
$ source build/make/rbesetup.sh && lunch aosp_arm64-userdebug
$ m sepolicy_generate_compat
$ sepolicy_generate_compat --branch=tm-dev \
--build latest --target-version 33.0 \
--latest-version 32.0
This change also enables treble_sepolicy_tests_33.0 and installs
33.0.cil mapping file onto the device.
Test: m treble_sepolicy_tests_33.0
Test: m 33.0_compat_test
Test: m slinux_policy
Change-Id: Ie969ff0372ff1268776165cee5cb5b07d303453c
diff --git a/compat/Android.bp b/compat/Android.bp
index b473e52..2370c7b 100644
--- a/compat/Android.bp
+++ b/compat/Android.bp
@@ -55,7 +55,14 @@
name: "plat_32.0.cil",
stem: "32.0.cil",
bottom_half: [":32.0.board.compat.map{.plat_private}"],
- // top_half: "plat_33.0.cil",
+ top_half: "plat_33.0.cil",
+}
+
+se_cil_compat_map {
+ name: "plat_33.0.cil",
+ stem: "33.0.cil",
+ bottom_half: [":33.0.board.compat.map{.plat_private}"],
+ // top_half: "plat_34.0.cil",
}
se_cil_compat_map {
@@ -94,7 +101,15 @@
name: "system_ext_32.0.cil",
stem: "32.0.cil",
bottom_half: [":32.0.board.compat.map{.system_ext_private}"],
- // top_half: "system_ext_33.0.cil",
+ top_half: "system_ext_33.0.cil",
+ system_ext_specific: true,
+}
+
+se_cil_compat_map {
+ name: "system_ext_33.0.cil",
+ stem: "33.0.cil",
+ bottom_half: [":33.0.board.compat.map{.system_ext_private}"],
+ // top_half: "system_ext_34.0.cil",
system_ext_specific: true,
}
@@ -134,7 +149,15 @@
name: "product_32.0.cil",
stem: "32.0.cil",
bottom_half: [":32.0.board.compat.map{.product_private}"],
- // top_half: "product_33.0.cil",
+ top_half: "product_33.0.cil",
+ product_specific: true,
+}
+
+se_cil_compat_map {
+ name: "product_33.0.cil",
+ stem: "33.0.cil",
+ bottom_half: [":33.0.board.compat.map{.product_private}"],
+ // top_half: "product_34.0.cil",
product_specific: true,
}
@@ -165,7 +188,13 @@
se_cil_compat_map {
name: "32.0.ignore.cil",
bottom_half: [":32.0.board.ignore.map{.plat_private}"],
- // top_half: "33.0.ignore.cil",
+ top_half: "33.0.ignore.cil",
+}
+
+se_cil_compat_map {
+ name: "33.0.ignore.cil",
+ bottom_half: [":33.0.board.ignore.map{.plat_private}"],
+ // top_half: "34.0.ignore.cil",
}
se_cil_compat_map {
@@ -185,7 +214,14 @@
se_cil_compat_map {
name: "system_ext_32.0.ignore.cil",
bottom_half: [":32.0.board.ignore.map{.system_ext_private}"],
- // top_half: "system_ext_33.0.ignore.cil",
+ top_half: "system_ext_33.0.ignore.cil",
+ system_ext_specific: true,
+}
+
+se_cil_compat_map {
+ name: "system_ext_33.0.ignore.cil",
+ bottom_half: [":33.0.board.ignore.map{.system_ext_private}"],
+ // top_half: "system_ext_34.0.ignore.cil",
system_ext_specific: true,
}
@@ -206,7 +242,14 @@
se_cil_compat_map {
name: "product_32.0.ignore.cil",
bottom_half: [":32.0.board.ignore.map{.product_private}"],
- // top_half: "product_33.0.ignore.cil",
+ top_half: "product_33.0.ignore.cil",
+ product_specific: true,
+}
+
+se_cil_compat_map {
+ name: "product_33.0.ignore.cil",
+ bottom_half: [":33.0.board.ignore.map{.product_private}"],
+ // top_half: "product_34.0.ignore.cil",
product_specific: true,
}
@@ -236,6 +279,11 @@
}
se_compat_cil {
+ name: "33.0.compat.cil",
+ srcs: [":33.0.board.compat.cil{.plat_private}"],
+}
+
+se_compat_cil {
name: "system_ext_28.0.compat.cil",
srcs: [":28.0.board.compat.cil{.system_ext_private}"],
stem: "28.0.compat.cil",
@@ -270,6 +318,13 @@
system_ext_specific: true,
}
+se_compat_cil {
+ name: "system_ext_33.0.compat.cil",
+ srcs: [":33.0.board.compat.cil{.system_ext_private}"],
+ stem: "33.0.compat.cil",
+ system_ext_specific: true,
+}
+
se_compat_test {
name: "sepolicy_compat_test",
}