Add 31.0 mapping files
Steps taken to produce the mapping files: 1. Add prebuilts/api/31.0/plat_pub_versioned.cil from the /vendor/etc/selinux/plat_pub_versioned.cil file built on sc-dev with lunch target aosp_arm64-eng. Add prebuilts/api/31.0/vendor_sepolicy.cil as an empty file. 2. Add new file private/compat/31.0/31.0.cil by doing the following: - copy /system/etc/selinux/mapping/31.0.cil from sc-dev aosp_arm64-eng device to private/compat/31.0/31.0.cil - remove all attribute declaration statement (typeattribute ...) and sort lines alphabetically - some selinux types were added/renamed/deleted w.r.t 31 sepolicy. Find all such types using treble_sepolicy_tests_31.0 test. - for all these types figure out where to map them by looking at 30.0.[ignore.]cil files and add approprite entries to 31.0.[ignore.]cil. This change also enables treble_sepolicy_tests_31.0 and installs 31.0.cil mapping file onto the device. Bug: 189161483 Test: m treble_sepolicy_tests_31.0 Test: m 31.0_compat_test Test: m selinux_policy Change-Id: I6264b9cf77b80543dfea93157b45b864157e2b14
This commit is contained in:
parent
08d4c8fa6e
commit
4f20ff73ee
88
Android.bp
88
Android.bp
@ -79,6 +79,13 @@ se_filegroup {
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "31.0.board.compat.map",
|
||||
srcs: [
|
||||
"compat/31.0/31.0.cil",
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "26.0.board.compat.cil",
|
||||
srcs: [
|
||||
@ -114,6 +121,13 @@ se_filegroup {
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "31.0.board.compat.cil",
|
||||
srcs: [
|
||||
"compat/31.0/31.0.compat.cil",
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "26.0.board.ignore.map",
|
||||
srcs: [
|
||||
@ -149,6 +163,13 @@ se_filegroup {
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "31.0.board.ignore.map",
|
||||
srcs: [
|
||||
"compat/31.0/31.0.ignore.cil",
|
||||
],
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "plat_26.0.cil",
|
||||
stem: "26.0.cil",
|
||||
@ -181,7 +202,14 @@ 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",
|
||||
top_half: "plat_31.0.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "plat_31.0.cil",
|
||||
stem: "31.0.cil",
|
||||
bottom_half: [":31.0.board.compat.map"],
|
||||
// top_half: "plat_32.0.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
@ -220,7 +248,15 @@ 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",
|
||||
top_half: "system_ext_31.0.cil",
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "system_ext_31.0.cil",
|
||||
stem: "31.0.cil",
|
||||
bottom_half: [":31.0.board.compat.map"],
|
||||
// top_half: "system_ext_32.0.cil",
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
@ -260,7 +296,15 @@ 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",
|
||||
top_half: "product_31.0.cil",
|
||||
product_specific: true,
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "product_31.0.cil",
|
||||
stem: "31.0.cil",
|
||||
bottom_half: [":31.0.board.compat.map"],
|
||||
// top_half: "product_32.0.cil",
|
||||
product_specific: true,
|
||||
}
|
||||
|
||||
@ -291,20 +335,40 @@ se_cil_compat_map {
|
||||
se_cil_compat_map {
|
||||
name: "30.0.ignore.cil",
|
||||
bottom_half: [":30.0.board.ignore.map"],
|
||||
// top_half: "31.0.ignore.cil",
|
||||
top_half: "31.0.ignore.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "31.0.ignore.cil",
|
||||
bottom_half: [":31.0.board.ignore.map"],
|
||||
// top_half: "32.0.ignore.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "system_ext_30.0.ignore.cil",
|
||||
bottom_half: [":30.0.board.ignore.map"],
|
||||
// top_half: "system_ext_31.0.ignore.cil",
|
||||
top_half: "system_ext_31.0.ignore.cil",
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "system_ext_31.0.ignore.cil",
|
||||
bottom_half: [":31.0.board.ignore.map"],
|
||||
// top_half: "system_ext_32.0.ignore.cil",
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "product_30.0.ignore.cil",
|
||||
bottom_half: [":30.0.board.ignore.map"],
|
||||
// top_half: "product_31.0.ignore.cil",
|
||||
top_half: "product_31.0.ignore.cil",
|
||||
product_specific: true,
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "product_31.0.ignore.cil",
|
||||
bottom_half: [":31.0.board.ignore.map"],
|
||||
// top_half: "product_32.0.ignore.cil",
|
||||
product_specific: true,
|
||||
}
|
||||
|
||||
@ -333,6 +397,11 @@ se_compat_cil {
|
||||
srcs: [":30.0.board.compat.cil"],
|
||||
}
|
||||
|
||||
se_compat_cil {
|
||||
name: "31.0.compat.cil",
|
||||
srcs: [":31.0.board.compat.cil"],
|
||||
}
|
||||
|
||||
se_compat_cil {
|
||||
name: "system_ext_26.0.compat.cil",
|
||||
srcs: [":26.0.board.compat.cil"],
|
||||
@ -368,6 +437,13 @@ se_compat_cil {
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
se_compat_cil {
|
||||
name: "system_ext_31.0.compat.cil",
|
||||
srcs: [":31.0.board.compat.cil"],
|
||||
stem: "31.0.compat.cil",
|
||||
system_ext_specific: true,
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "file_contexts_files",
|
||||
srcs: ["file_contexts"],
|
||||
|
@ -1517,6 +1517,8 @@ version_under_treble_tests := 29.0
|
||||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
version_under_treble_tests := 30.0
|
||||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
version_under_treble_tests := 31.0
|
||||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
endif # PRODUCT_SEPOLICY_SPLIT
|
||||
|
||||
version_under_treble_tests := 26.0
|
||||
@ -1529,6 +1531,8 @@ version_under_treble_tests := 29.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
version_under_treble_tests := 30.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
version_under_treble_tests := 31.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
|
||||
base_plat_policy.conf :=
|
||||
base_plat_pub_policy.conf :=
|
||||
|
3283
prebuilts/api/31.0/plat_pub_versioned.cil
Normal file
3283
prebuilts/api/31.0/plat_pub_versioned.cil
Normal file
File diff suppressed because it is too large
Load Diff
1
prebuilts/api/31.0/vendor_sepolicy.cil
Normal file
1
prebuilts/api/31.0/vendor_sepolicy.cil
Normal file
@ -0,0 +1 @@
|
||||
;; empty stub
|
2460
private/compat/31.0/31.0.cil
Normal file
2460
private/compat/31.0/31.0.cil
Normal file
File diff suppressed because it is too large
Load Diff
1
private/compat/31.0/31.0.compat.cil
Normal file
1
private/compat/31.0/31.0.compat.cil
Normal file
@ -0,0 +1 @@
|
||||
;; This file can't be empty.
|
11
private/compat/31.0/31.0.ignore.cil
Normal file
11
private/compat/31.0/31.0.ignore.cil
Normal file
@ -0,0 +1,11 @@
|
||||
;; new_objects - a collection of types that have been introduced that have no
|
||||
;; analogue in older policy. Thus, we do not need to map these types to
|
||||
;; previous ones. Add here to pass checkapi tests.
|
||||
(type new_objects)
|
||||
(typeattribute new_objects)
|
||||
(typeattributeset new_objects
|
||||
( new_objects
|
||||
artd_service
|
||||
power_stats_service
|
||||
transformer_service
|
||||
))
|
Loading…
Reference in New Issue
Block a user