summaryrefslogtreecommitdiffstats
path: root/etc/init.rc
diff options
context:
space:
mode:
Diffstat (limited to 'etc/init.rc')
-rw-r--r--etc/init.rc19
1 files changed, 5 insertions, 14 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 0822aba03..3ec45db2f 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -4,6 +4,10 @@ on early-init
# Set the security context of /postinstall if present.
restorecon /postinstall
+ # Copy prebuilt ld.config.txt into linkerconfig directory
+ copy /system/etc/ld.config.txt /linkerconfig/ld.config.txt
+ chmod 444 /linkerconfig/ld.config.txt
+
start ueventd
setprop sys.usb.configfs 0
@@ -44,10 +48,6 @@ on boot
class_start default
-# Load properties from /system/ + /factory after fs mount.
-on load_system_props_action
- load_system_props
-
on firmware_mounts_complete
rm /dev/.booting
@@ -58,11 +58,6 @@ on late-init
trigger post-fs
trigger post-fs-data
- # Load properties from /system/ + /factory after fs mount. Place
- # this in another action so that the load will be scheduled after the prior
- # issued fs triggers have completed.
- trigger load_system_props_action
-
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete
@@ -95,10 +90,6 @@ service fastbootd /system/bin/fastbootd
on property:service.adb.root=1
restart adbd
-# Always start adbd on userdebug and eng builds
-on fs && property:ro.debuggable=1
- setprop sys.usb.config adb
-
on fs && property:sys.usb.configfs=1
mount configfs none /config
mkdir /config/usb_gadget/g1 0770 shell shell
@@ -134,7 +125,7 @@ on property:sys.usb.config=fastboot
on property:sys.usb.config=none && property:sys.usb.configfs=0
stop adbd
- stop fastboot
+ stop fastbootd
write /sys/class/android_usb/android0/enable 0
setprop sys.usb.state ${sys.usb.config}