commit 1e6ee759b35ce79483d8fc4a5bb24553654a39d0
author Daniel Rosenberg <drosen@google.com> Sat Aug 01 00:24:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 01 00:24:00 2015 +0000
tree 22dda2013eaa81d786b8c20dab20e01da6b67a83
parent 93d8ea20b853e02ad995874f644346a6a6270db9
parent c26fddcc5be8876854fe3b44c0c48a0c47de8c07

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

* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index b16cab8..6f42053 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -873,7 +873,7 @@
   $(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)/