Merge "Do not remove init.recovery.*.rc in recovery root" am: f184554771
am: 4cd430cb3e
am: 6f2e41dbdf
Change-Id: Ie05b980984e09ab691faa427a0eb04713c3c8e2d
This commit is contained in:
commit
92b8f67f4f
1 changed files with 2 additions and 1 deletions
|
@ -1198,7 +1198,8 @@ define build-recoveryimage-target
|
|||
@echo Modifying ramdisk contents...
|
||||
$(if $(BOARD_RECOVERY_KERNEL_MODULES), \
|
||||
$(call build-image-kernel-modules,$(BOARD_RECOVERY_KERNEL_MODULES),$(TARGET_RECOVERY_ROOT_OUT),,$(call intermediates-dir-for,PACKAGING,depmod_recovery)))
|
||||
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
|
||||
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
|
||||
$(hide) find $(TARGET_RECOVERY_ROOT_OUT) -maxdepth 1 -name 'init*.rc' -type f -not -name "init.recovery.*.rc" | xargs rm -f
|
||||
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
|
||||
$(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ || true # Ignore error when the src file doesn't exist.
|
||||
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
|
||||
|
|
Loading…
Reference in a new issue