ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move adbd from root to system" into oc-mr1-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-08-18 03:52:36 +00:00 • committed by Android (Google) Code Review
commit 0bb4cb6fa2
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/Android.mk
View file

@ -360,8 +360,6 @@ endif
LOCAL_MODULE := adbd LOCAL_MODULE := adbd
LOCAL_FORCE_STATIC_EXECUTABLE := true 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_SANITIZE := $(adb_target_sanitize)
LOCAL_STRIP_MODULE := keep_symbols LOCAL_STRIP_MODULE := keep_symbols

2
rootdir/init.usb.rc
View file

@ -12,7 +12,7 @@ on post-fs-data
mkdir /data/adb 0700 root root mkdir /data/adb 0700 root root
# adbd is controlled via property triggers in init.<platform>.usb.rc # 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 class core
socket adbd stream 660 system system socket adbd stream 660 system system
disabled disabled