commit 1269cfbd027a9c306581e92b2db075f4ea20ba0f
author Tao Bao <tbao@google.com> Wed Jan 13 18:50:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 13 18:50:12 2016 +0000
tree a5367cf575e6d1d84b923a3254e5a38a64209cde
parent 614470e77d98f1bf4701ff2bc00e5411490ec2ab
parent 506cbfa8b4f8e70900527311528a60053dae1c61

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

* commit '506cbfa8b4f8e70900527311528a60053dae1c61':
  Fix mounting /sdcard under recovery.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 42d92c9..9220771 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -920,9 +920,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)/