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

am: f390f04381

Change-Id: I5916c9dc47c2560c0acbdc1b405e752e041d4bbe
This commit is contained in:
Bowgo Tsai 2017-08-31 06:35:57 +00:00 committed by android-build-merger
commit 53aeb8af81
2 changed files with 1 additions and 3 deletions

View file

@ -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

View file

@ -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