commit 98d7ea3dc7b5d15f6350abb4d2c34108fc7bfb55
author David Pursell <dpursell@google.com> Fri Sep 04 23:54:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 04 23:54:19 2015 +0000
tree 44eebfaebf5d57a4218239c6811dea88e2afeaf3
parent 40602c60eba2de7ec81dc874a83b27ec75f40465
parent 5aba4b04a36f508106beedd7ee7c922b8d2af6e6

Merge changes from topic 'adb_shell_prework'

* changes:
  adb: create shell protocol class.
  adb: refactor subprocess code.
  adb: move shell service to a separate file.

Android.mk

diff --git a/Android.mk b/Android.mk
index 81d94ed..b0dcfac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -274,8 +274,6 @@
 
 LOCAL_MODULE := adbd
 
-LOCAL_INIT_RC := adbd.rc
-
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

adbd.rc

diff --git a/adbd.rc b/adbd.rc
deleted file mode 100644
index b91d8b5..0000000
--- a/adbd.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-on post-fs-data
-    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