Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d6f8516 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move adbd from root to system"

parents 537c68c8 7b9a4d5b

adb/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -355,8 +355,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

rootdir/init.usb.rc

+1 −1
Original line number Original line Diff line number Diff line
@@ -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