tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 479ec682: Merge "Fix "argument list too long""

Browse source 
* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
  Fix "argument list too long"
This commit is contained in:
Ying Wang 2011-04-14 10:17:34 -07:00 committed by Android Git Automerger
commit 8c425a9d7c
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/definitions.mk
View file

@ -980,6 +980,24 @@ endef
## Commands for running ar ## Commands for running ar
########################################################### ###########################################################
define _concat-if-arg2-not-empty
$(if $(2),$(hide) $(1) $(2))
endef
# Split long argument list into smaller groups and call the command repeatedly
#
# $(1): the command without arguments
# $(2): the arguments
define split-long-arguments
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1,500,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 501,1000,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1001,1500,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1501,2000,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 2001,2500,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 2501,3000,$(2)))
$(call _concat-if-arg2-not-empty,$(1),$(wordlist 3001,99999,$(2)))
endef
define extract-and-include-target-whole-static-libs define extract-and-include-target-whole-static-libs
$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \ $(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
$(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \ $(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
@ -1002,8 +1020,7 @@ define transform-o-to-static-lib
@rm -f $@ @rm -f $@
$(extract-and-include-target-whole-static-libs) $(extract-and-include-target-whole-static-libs)
@echo "target StaticLib: $(PRIVATE_MODULE) ($@)" @echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
$(hide) echo $(filter %.o, $^) | \ $(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
endef endef
########################################################### ###########################################################
@ -1012,7 +1029,7 @@ endef
define extract-and-include-host-whole-static-libs define extract-and-include-host-whole-static-libs
$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \ $(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \ $(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(lib)))_objs;\ ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(lib)))_objs;\
rm -rf $$ldir; \ rm -rf $$ldir; \
mkdir -p $$ldir; \ mkdir -p $$ldir; \
@ -1032,8 +1049,7 @@ define transform-host-o-to-static-lib
@rm -f $@ @rm -f $@
$(extract-and-include-host-whole-static-libs) $(extract-and-include-host-whole-static-libs)
@echo "host StaticLib: $(PRIVATE_MODULE) ($@)" @echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
echo $(filter %.o, $^) | \ $(call split-long-arguments,$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
endef endef