Skip to content
Snippets Groups Projects
Commit 5846c79e authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Moving adbd from rootdir to system/bin

Bug: 63910933
Test: boot sailfish in normal mode, checks adbd is started
Test: boot sailfish in recovery mode, checks adbd is started
Test: boot bullhead in normal mode, checks adbd is started
Test: boot bullhead in recovery mode, checks adbd is started

Change-Id: I35ed78a15a34626fbd3c21d030e2bf51033f7b79
Merged-In: I35ed78a15a34626fbd3c21d030e2bf51033f7b79
(cherry picked from commit e2423d14)
parent d27aee33
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
typeattribute adbd coredomain; typeattribute adbd coredomain;
typeattribute adbd mlstrustedsubject; typeattribute adbd mlstrustedsubject;
init_daemon_domain(adbd)
domain_auto_trans(adbd, shell_exec, shell) domain_auto_trans(adbd, shell_exec, shell)
userdebug_or_eng(` userdebug_or_eng(`
......
...@@ -270,6 +270,7 @@ ...@@ -270,6 +270,7 @@
/system/etc/selinux/plat_sepolicy.cil u:object_r:sepolicy_file:s0 /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/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/vr_hwc u:object_r:vr_hwc_exec:s0
/system/bin/adbd u:object_r:adbd_exec:s0
############################# #############################
# Vendor files # Vendor files
......
...@@ -3,11 +3,11 @@ typeattribute init coredomain; ...@@ -3,11 +3,11 @@ typeattribute init coredomain;
tmpfs_domain(init) tmpfs_domain(init)
# Transitions to seclabel processes in init.rc # Transitions to seclabel processes in init.rc
domain_trans(init, rootfs, adbd)
domain_trans(init, rootfs, charger) domain_trans(init, rootfs, charger)
domain_trans(init, rootfs, healthd) domain_trans(init, rootfs, healthd)
domain_trans(init, rootfs, slideshow) domain_trans(init, rootfs, slideshow)
recovery_only(` recovery_only(`
domain_trans(init, rootfs, adbd)
domain_trans(init, rootfs, recovery) domain_trans(init, rootfs, recovery)
') ')
domain_trans(init, shell_exec, shell) domain_trans(init, shell_exec, shell)
......
# adbd seclabel is specified in init.rc since # adbd seclabel is specified in init.rc since
# it lives in the rootfs and has no unique file type. # it lives in the rootfs and has no unique file type.
type adbd, domain; type adbd, domain;
type adbd_exec, exec_type, file_type;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment