commit 7b82656984513467af48872f6e808e61acfda918
author Daniel Rosenberg <drosen@google.com> Tue Jun 02 16:40:58 2015 -0700
committer Daniel Rosenberg <drosen@google.com> Fri Jul 31 16:52:21 2015 -0700
tree a99e45f3f102f0d95248a964a402562bd15ceb22
parent e6853b0d63b5ee29a4d5f25d09cd0683b5a90b8c

build: core: Fix issue in recovery

Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 81a0270..ece15ce 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -844,7 +844,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)/