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

Commit 00985df8 authored by Ying Wang's avatar Ying Wang Committed by Ying Wang
Browse files

Fix "argument list too long" 

Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
parent e442c136

core/definitions.mk

+21 −5
Original line number Diff line number Diff line
@@ -980,6 +980,24 @@ endef 
## 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

$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \

	$(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
@@ -1002,8 +1020,7 @@ define transform-o-to-static-lib 
@rm -f $@

$(extract-and-include-target-whole-static-libs)

@echo "target StaticLib: $(PRIVATE_MODULE) ($@)"

$(hide) echo $(filter %.o, $^) | \

    xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@

$(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))

endef



###########################################################
@@ -1012,7 +1029,7 @@ endef 


define extract-and-include-host-whole-static-libs

$(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;\

	rm -rf $$ldir; \

	mkdir -p $$ldir; \
@@ -1032,8 +1049,7 @@ define transform-host-o-to-static-lib 
@rm -f $@

$(extract-and-include-host-whole-static-libs)

@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"

echo $(filter %.o, $^) | \

	xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@

$(call split-long-arguments,$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))

endef