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

Commit 2270dbbc authored by Tom Cherry's avatar Tom Cherry
Browse files

combine adbd.rc with init.usb.rc 

init.usb.rc and adbd.rc contain similar contents and belong in the same
file.

This file also belongs on the ramdisk as adbd is on the ramdisk, not the
system partition, therefore resolving to keep init.usb.rc in its current
location and combining the contents of adbd.rc is the best approach

Change-Id: I430f8fea58694679e7b8b7be69ce87daadd616f4
parent b4998341

adb/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -264,8 +264,6 @@ endif 


LOCAL_MODULE := adbd



LOCAL_INIT_RC := adbd.rc



LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)

LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

adb/adbd.rc

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
on post-fs-data

    mkdir /data/misc/adb 02750 system shell

    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

    class core

    socket adbd stream 660 system system

    disabled

    seclabel u:r:adbd:s0



# adbd on at boot in emulator

on property:ro.kernel.qemu=1

    start adbd

rootdir/init.usb.rc

+13 −0
Original line number Diff line number Diff line
@@ -8,6 +8,19 @@ on post-fs-data 
    chmod 0660 /sys/class/android_usb/android0/f_mass_storage/lun/file

    chown system system /sys/class/android_usb/android0/f_rndis/ethaddr

    chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr

    mkdir /data/misc/adb 02750 system shell

    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

    class core

    socket adbd stream 660 system system

    disabled

    seclabel u:r:adbd:s0



# adbd on at boot in emulator

on property:ro.kernel.qemu=1

    start adbd



# Used to disable USB when switching states

on property:sys.usb.config=none