Merge "Moving adbd from rootdir to system/bin"
am: 851d5b64da
Change-Id: Idc8aef8e3d250b7b7f40d0a51a528988f629298c
This commit is contained in:
commit
03015901e3
4 changed files with 5 additions and 1 deletions
|
@ -3,6 +3,8 @@
|
|||
typeattribute adbd coredomain;
|
||||
typeattribute adbd mlstrustedsubject;
|
||||
|
||||
init_daemon_domain(adbd)
|
||||
|
||||
domain_auto_trans(adbd, shell_exec, shell)
|
||||
|
||||
userdebug_or_eng(`
|
||||
|
|
|
@ -271,6 +271,7 @@
|
|||
/system/etc/selinux/plat_sepolicy.cil u:object_r:sepolicy_file:s0
|
||||
/system/etc/selinux/plat_and_mapping_sepolicy\.cil\.sha256 u:object_r:sepolicy_file:s0
|
||||
/system/bin/vr_hwc u:object_r:vr_hwc_exec:s0
|
||||
/system/bin/adbd u:object_r:adbd_exec:s0
|
||||
|
||||
#############################
|
||||
# Vendor files
|
||||
|
|
|
@ -3,12 +3,12 @@ typeattribute init coredomain;
|
|||
tmpfs_domain(init)
|
||||
|
||||
# Transitions to seclabel processes in init.rc
|
||||
domain_trans(init, rootfs, adbd)
|
||||
domain_trans(init, rootfs, charger)
|
||||
domain_trans(init, rootfs, healthd)
|
||||
domain_trans(init, rootfs, slideshow)
|
||||
domain_auto_trans(init, e2fs_exec, e2fs)
|
||||
recovery_only(`
|
||||
domain_trans(init, rootfs, adbd)
|
||||
domain_trans(init, rootfs, recovery)
|
||||
')
|
||||
domain_trans(init, shell_exec, shell)
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# adbd seclabel is specified in init.rc since
|
||||
# it lives in the rootfs and has no unique file type.
|
||||
type adbd, domain;
|
||||
type adbd_exec, exec_type, file_type;
|
||||
|
|
Loading…
Reference in a new issue