Merge "Fixed typo during stopping fastboot"
diff --git a/Android.bp b/Android.bp
index 45aafb0..d78c3fa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,6 +94,14 @@
],
}
+prebuilt_etc {
+ name: "init_recovery.rc",
+ filename: "init.rc",
+ src: "etc/init.rc",
+ sub_dir: "init/hw",
+ recovery: true,
+}
+
cc_binary {
name: "recovery",
recovery: true,
@@ -119,11 +127,13 @@
required: [
"e2fsdroid.recovery",
+ "init_recovery.rc",
"librecovery_ui_ext",
"minadbd",
"mke2fs.conf.recovery",
"mke2fs.recovery",
"recovery_deps",
+ "ueventd.rc.recovery",
],
}
diff --git a/etc/init.rc b/etc/init.rc
index d1c4f04..12411ac 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -44,10 +44,6 @@
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 +54,6 @@
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