am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"

* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
This commit is contained in:
Daniel Rosenberg 2015-08-01 00:24:00 +00:00 committed by Android Git Automerger
commit 1e6ee759b3

View file

@ -873,7 +873,7 @@ define build-recoveryimage-target
$(hide) mkdir -p $(TARGET_RECOVERY_OUT)
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp
@echo Copying baseline ramdisk...
$(hide) rsync -a $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
$(hide) rsync -a --exclude=etc $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
@echo Modifying ramdisk contents...
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/