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 e2423d149b6a5b9119965c097a2a75cb8d052763)
diff --git a/private/adbd.te b/private/adbd.te
index 2008364..d28b836 100644
--- a/private/adbd.te
+++ b/private/adbd.te
@@ -3,6 +3,8 @@
typeattribute adbd coredomain;
typeattribute adbd mlstrustedsubject;
+init_daemon_domain(adbd)
+
domain_auto_trans(adbd, shell_exec, shell)
userdebug_or_eng(`
diff --git a/private/file_contexts b/private/file_contexts
index 222167b..4b9d0de 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -270,6 +270,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
diff --git a/private/init.te b/private/init.te
index 568e0d3..726f138 100644
--- a/private/init.te
+++ b/private/init.te
@@ -3,11 +3,11 @@
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)
recovery_only(`
+ domain_trans(init, rootfs, adbd)
domain_trans(init, rootfs, recovery)
')
domain_trans(init, shell_exec, shell)