commit 506cbfa8b4f8e70900527311528a60053dae1c61
author Tao Bao <tbao@google.com> Tue Jan 12 22:32:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 22:32:11 2016 +0000
tree 315998df2b1fb3b1510c55499997f981ad27dd47
parent bad18cd9cff1c89f26da2ab771730eb682c9a73f
parent 948b9c30b4197a709846e604c8e571d90161b17f

Merge "Fix mounting /sdcard under recovery."
am: 948b9c30b4

* commit '948b9c30b4197a709846e604c8e571d90161b17f':
  Fix mounting /sdcard under recovery.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 73f933e..f21cee7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -921,9 +921,9 @@
 define build-recoveryimage-target
   @echo ----- Making recovery image ------
   $(hide) mkdir -p $(TARGET_RECOVERY_OUT)
-  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp
+  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp
   @echo Copying baseline ramdisk...
-  $(hide) rsync -a --exclude=etc $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
+  $(hide) rsync -a --exclude=etc --exclude=sdcard $(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)/