commit e4fed421d5939469bf35cd6430300207a0ff4901
author Daniel Rosenberg <drosen@google.com> Sat Aug 01 00:10:09 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 01 00:10:09 2015 +0000
tree 3851bb8a05d86e0b50aaeb1f38c5b2a3dd9d42c8
parent 22354d3c496e2c21f873758d996878e68c2607bb
parent 7b82656984513467af48872f6e808e61acfda918

Merge "build: core: Fix issue in recovery"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index dc6d257..d43cb78 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -846,7 +846,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)/