summaryrefslogtreecommitdiff
path: root/rootdir/init.usb.rc
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2015-09-03 16:14:51 -0700
committerTom Cherry <tomcherry@google.com>2015-09-03 16:19:04 -0700
commit2270dbbc841f0c98d2c7a6fafea128350aa3abf4 (patch)
treeae64e6df813246eb44497a85756a6ced55b94a4d /rootdir/init.usb.rc
parentb499834121854fd98664d8d96734c733f96dbc1f (diff)
combine adbd.rc with init.usb.rc
init.usb.rc and adbd.rc contain similar contents and belong in the same file. This file also belongs on the ramdisk as adbd is on the ramdisk, not the system partition, therefore resolving to keep init.usb.rc in its current location and combining the contents of adbd.rc is the best approach Change-Id: I430f8fea58694679e7b8b7be69ce87daadd616f4
Diffstat (limited to 'rootdir/init.usb.rc')
-rw-r--r--rootdir/init.usb.rc13
1 files changed, 13 insertions, 0 deletions
diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index e290ca47f..4e6f2a8c9 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -8,6 +8,19 @@ on post-fs-data
chmod 0660 /sys/class/android_usb/android0/f_mass_storage/lun/file
chown system system /sys/class/android_usb/android0/f_rndis/ethaddr
chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr
+ mkdir /data/misc/adb 02750 system shell
+ mkdir /data/adb 0700 root root
+
+# adbd is controlled via property triggers in init.<platform>.usb.rc
+service adbd /sbin/adbd --root_seclabel=u:r:su:s0
+ class core
+ socket adbd stream 660 system system
+ disabled
+ seclabel u:r:adbd:s0
+
+# adbd on at boot in emulator
+on property:ro.kernel.qemu=1
+ start adbd
# Used to disable USB when switching states
on property:sys.usb.config=none