commit 1ed5ff6daf83bd4e44895535483235877dd2d57c
author Bowgo Tsai <bowgotsai@google.com> Thu Aug 31 06:35:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 06:35:57 2017 +0000
tree 939730eaf9ca48a3acc767773ce47f1108418c39
parent 4de08115707037ef73969a530e42ffd1d9a54093
parent 1221b3d2d8363189a06f5be1bf5b4d64e6ce8d9e

Merge "Move adbd from root to system" am: 3d6f85167e
am: f390f04381

Change-Id: I5916c9dc47c2560c0acbdc1b405e752e041d4bbe

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 68408f3..64cf6d8 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -355,8 +355,6 @@
 LOCAL_MODULE := adbd
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
-LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
 
 LOCAL_SANITIZE := $(adb_target_sanitize)
 LOCAL_STRIP_MODULE := keep_symbols

rootdir/init.usb.rc

diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index 915d159..3168f40 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -12,7 +12,7 @@
     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
+service adbd /system/bin/adbd --root_seclabel=u:r:su:s0
     class core
     socket adbd stream 660 system system
     disabled