Reland "Add 29.0 mapping files"
am: 50aa029f4b
Change-Id: I6ea1cc54d313ecdb393c7a7f867d2527b35d42cd
This commit is contained in:
commit
5d1701a3ee
7 changed files with 4226 additions and 5 deletions
42
Android.bp
42
Android.bp
|
@ -35,6 +35,13 @@ se_filegroup {
|
|||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "29.0.board.compat.map",
|
||||
srcs: [
|
||||
"compat/29.0/29.0.cil",
|
||||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "26.0.board.ignore.map",
|
||||
srcs: [
|
||||
|
@ -56,6 +63,13 @@ se_filegroup {
|
|||
],
|
||||
}
|
||||
|
||||
se_filegroup {
|
||||
name: "29.0.board.ignore.map",
|
||||
srcs: [
|
||||
"compat/29.0/29.0.ignore.cil",
|
||||
],
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "26.0.cil",
|
||||
bottom_half: [":26.0.board.compat.map"],
|
||||
|
@ -71,7 +85,13 @@ se_cil_compat_map {
|
|||
se_cil_compat_map {
|
||||
name: "28.0.cil",
|
||||
bottom_half: [":28.0.board.compat.map"],
|
||||
// top_half: "29.0.cil",
|
||||
top_half: "29.0.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "29.0.cil",
|
||||
bottom_half: [":29.0.board.compat.map"],
|
||||
// top_half: "30.0.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
|
@ -92,9 +112,15 @@ se_cil_compat_map {
|
|||
// top_half: "29.0.ignore.cil",
|
||||
}
|
||||
|
||||
se_cil_compat_map {
|
||||
name: "29.0.ignore.cil",
|
||||
bottom_half: [":29.0.board.ignore.map"],
|
||||
// top_half: "30.0.ignore.cil",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "28.0.compat.cil",
|
||||
src: "private/compat/28.0/28.0.compat.cil",
|
||||
name: "26.0.compat.cil",
|
||||
src: "private/compat/26.0/26.0.compat.cil",
|
||||
sub_dir: "selinux/mapping",
|
||||
}
|
||||
|
||||
|
@ -105,8 +131,14 @@ prebuilt_etc {
|
|||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "26.0.compat.cil",
|
||||
src: "private/compat/26.0/26.0.compat.cil",
|
||||
name: "28.0.compat.cil",
|
||||
src: "private/compat/28.0/28.0.compat.cil",
|
||||
sub_dir: "selinux/mapping",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "29.0.compat.cil",
|
||||
src: "private/compat/29.0/29.0.compat.cil",
|
||||
sub_dir: "selinux/mapping",
|
||||
}
|
||||
|
||||
|
|
|
@ -1292,6 +1292,8 @@ version_under_treble_tests := 27.0
|
|||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
version_under_treble_tests := 28.0
|
||||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
version_under_treble_tests := 29.0
|
||||
include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
|
||||
|
||||
version_under_treble_tests := 26.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
|
@ -1299,6 +1301,8 @@ version_under_treble_tests := 27.0
|
|||
include $(LOCAL_PATH)/compat.mk
|
||||
version_under_treble_tests := 28.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
version_under_treble_tests := 29.0
|
||||
include $(LOCAL_PATH)/compat.mk
|
||||
|
||||
BASE_PLAT_PUBLIC_POLICY :=
|
||||
BASE_PLAT_PRIVATE_POLICY :=
|
||||
|
|
2208
prebuilts/api/29.0/plat_pub_versioned.cil
Normal file
2208
prebuilts/api/29.0/plat_pub_versioned.cil
Normal file
File diff suppressed because it is too large
Load diff
1
prebuilts/api/29.0/vendor_sepolicy.cil
Normal file
1
prebuilts/api/29.0/vendor_sepolicy.cil
Normal file
|
@ -0,0 +1 @@
|
|||
;; empty stub
|
1964
private/compat/29.0/29.0.cil
Normal file
1964
private/compat/29.0/29.0.cil
Normal file
File diff suppressed because it is too large
Load diff
1
private/compat/29.0/29.0.compat.cil
Normal file
1
private/compat/29.0/29.0.compat.cil
Normal file
|
@ -0,0 +1 @@
|
|||
;; This file can't be empty.
|
11
private/compat/29.0/29.0.ignore.cil
Normal file
11
private/compat/29.0/29.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
|
||||
device_config_sys_traced_prop
|
||||
runtime_apex_dir
|
||||
system_ashmem_hwservice
|
||||
vendor_apex_file))
|
Loading…
Reference in a new issue