Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af02e61 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix Mac build." into mnc-dev

parents f55c5a52 b4b767a4

core/tasks/tools/package-modules.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 $@) *