commit 1af02e61165a989f206395eb7401a0f5316cae42
author Ying Wang <wangying@google.com> Fri May 08 03:59:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 03:59:15 2015 +0000
tree a98a6d0d28c917b54fb9fc72f203c17497e1ece3
parent f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf
parent b4b767a484bfcb9ddccc025b0e3cb060b33aaeda

Merge "Fix Mac build." into mnc-dev

core/tasks/tools/package-modules.mk

diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk
index 2af2e20..a70e644 100644
--- a/core/tasks/tools/package-modules.mk
+++ b/core/tasks/tools/package-modules.mk
@@ -41,7 +41,7 @@
 $(hide) $(foreach p, $(1),\
   $(eval pair := $(subst :,$(space),$(p)))\
   mkdir -p $(dir $(word 2,$(pair)));\
-  cp -rf $(word 1,$(pair)) $(word 2,$(pair));)
+  cp -Rf $(word 1,$(pair)) $(word 2,$(pair));)
 endef
 
 my_package_zip := $(my_staging_dir)/$(my_package_name).zip
@@ -58,5 +58,5 @@
 	$(call copy-tests-in-batch,$(wordlist 1001,1200,$(PRIVATE_COPY_PAIRS)))
 	$(call copy-tests-in-batch,$(wordlist 1201,9999,$(PRIVATE_COPY_PAIRS)))
 	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
-	  cp -rfL $(f) $(dir $@);)
+	  cp -RfL $(f) $(dir $@);)
 	$(hide) cd $(dir $@) && zip -rq $(notdir $@) *