From 7b9a4d5bcd2cf49d464b82f0c7780fe3bcfd651f Mon Sep 17 00:00:00 2001
From: Bowgo Tsai <bowgotsai@google.com>
Date: Fri, 28 Jul 2017 20:29:15 +0800
Subject: [PATCH] Move adbd from root to system

Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works

Change-Id: I1b27910c06a4172ca718b3344736ec8e3429f477
Merged-In: I1b27910c06a4172ca718b3344736ec8e3429f477
(cherry picked from commit 93defc17f376041437e5157a7c4d9e0344441811)
---
 adb/Android.mk      | 2 --
 rootdir/init.usb.rc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/adb/Android.mk b/adb/Android.mk
index e195bec6a..7589af2b0 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -355,8 +355,6 @@ endif
 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
diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index 915d159a5..3168f40ba 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -12,7 +12,7 @@ on post-fs-data
     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