am 1af02e61: Merge "Fix Mac build." into mnc-dev

* commit '1af02e61165a989f206395eb7401a0f5316cae42':
  Fix Mac build.
This commit is contained in:
Ying Wang 2015-05-08 16:40:01 +00:00 committed by Android Git Automerger
commit b12df35b20
1 changed files with 2 additions and 2 deletions

View File

@ -41,7 +41,7 @@ define copy-tests-in-batch
$(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 @@ $(my_package_zip) : $(my_built_modules)
$(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 $@) *