summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2019-11-12 16:57:06 +0100
committerandroid-build-merger <android-build-merger@google.com>2019-11-12 16:57:06 +0100
commita762387a5b2380764e224fffb44121b3afe2a734 (patch)
tree296f65b868b39692a7ac177e23a947644eb0520c
parentMerge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552 am: ff8131a493 (diff)
parentMerge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar.gz
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar.bz2
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar.lz
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar.xz
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.tar.zst
android_bootable_recovery-a762387a5b2380764e224fffb44121b3afe2a734.zip
-rw-r--r--Android.bp10
-rw-r--r--etc/init.rc9
2 files changed, 10 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index aefcabe86..1ae8ff78d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -95,6 +95,14 @@ cc_library_static {
],
}
+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,
@@ -120,11 +128,13 @@ cc_binary {
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 d5b056ae8..c54de5af2 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -44,10 +44,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 +54,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