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

Commit df73a5fa authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Performance improvement for whole static libs"

parents 36ba1db4 e0f44ac2

core/definitions.mk

+13 −4
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ endef 


# $(1): the full path of the source static library.

define _extract-and-include-single-target-whole-static-lib

@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"

@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(strip $(1))]"

$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\

    rm -rf $$ldir; \

    mkdir -p $$ldir; \
@@ -1190,8 +1190,16 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs; 


endef



# $(1): the full path of the source static library.

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

$(if $(strip $(1)),

@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(strip $(1))]"

$(hide) cp $(1) $@)

endef



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

$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \

$(call extract-and-include-whole-static-libs-first, $(firstword $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)))

$(foreach lib,$(wordlist 2,999,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)), \

    $(call _extract-and-include-single-target-whole-static-lib, $(lib)))

endef
@@ -1213,7 +1221,7 @@ endef 


# $(1): the full path of the source static library.

define _extract-and-include-single-host-whole-static-lib

@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"

@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(strip $(1))]"

$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\

    rm -rf $$ldir; \

    mkdir -p $$ldir; \
@@ -1228,7 +1236,8 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs; 
endef



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

$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \

$(call extract-and-include-whole-static-libs-first, $(firstword $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)))

$(foreach lib,$(wordlist 2,999,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)), \

    $(call _extract-and-include-single-host-whole-static-lib, $(lib)))

endef