diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-11-13 17:05:59 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-13 17:05:59 +0100 |
| commit | 054861f9ebf731e69feca362995825b1f097d732 (patch) | |
| tree | 3505313476c69e201f8fddd4eb58e1893e5d369d | |
| parent | Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." (diff) | |
| parent | Merge "Move init and ueventd scripts from / to /system/etc" (diff) | |
| download | android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar.gz android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar.bz2 android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar.lz android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar.xz android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.tar.zst android_bootable_recovery-054861f9ebf731e69feca362995825b1f097d732.zip | |
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | etc/init.rc | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp index 45aafb043..d78c3fa94 100644 --- a/Android.bp +++ b/Android.bp @@ -94,6 +94,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, @@ -119,11 +127,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 |