tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "33.0_sepolicy_mapping_file" am: 4410dab4de

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2083164

Change-Id: Ib87df883bca1c7a81cf9270609f888769418d971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-05-03 02:21:52 +00:00 committed by Automerger Merge Worker
commit 9c142ddafc
5 changed files with 2698 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Android.bp
View file

@ -79,6 +79,13 @@ se_build_files {
],
}
se_build_files {
name: "33.0.board.compat.map",
srcs: [
"compat/33.0/33.0.cil",
],
}
se_build_files {
name: "28.0.board.compat.cil",
srcs: [
@ -114,6 +121,13 @@ se_build_files {
],
}
se_build_files {
name: "33.0.board.compat.cil",
srcs: [
"compat/33.0/33.0.compat.cil",
],
}
se_build_files {
name: "28.0.board.ignore.map",
srcs: [
@ -149,6 +163,13 @@ se_build_files {
],
}
se_build_files {
name: "33.0.board.ignore.map",
srcs: [
"compat/33.0/33.0.ignore.cil",
],
}
se_build_files {
name: "file_contexts_files",
srcs: ["file_contexts"],

67
compat/Android.bp
View file

@ -55,7 +55,14 @@ se_cil_compat_map {
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 @@ se_cil_compat_map {
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 @@ se_cil_compat_map {
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 {
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 {
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 {
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,
}
@ -235,6 +278,11 @@ se_compat_cil {
srcs: [":32.0.board.compat.cil{.plat_private}"],
}
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}"],
@ -270,6 +318,13 @@ se_compat_cil {
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",
}

2606
private/compat/33.0/33.0.cil Normal file
View file

File diff suppressed because it is too large Load diff

1
private/compat/33.0/33.0.compat.cil Normal file
View file

@ -0,0 +1 @@
;; This file can't be empty.

9
private/compat/33.0/33.0.ignore.cil Normal file
View file

@ -0,0 +1,9 @@
;; 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
))