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

Commit 80d38729 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries

parents 7fa3aa53 9ca21644

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ endef 


define extract-and-include-target-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; \
@@ -969,7 +969,8 @@ define transform-o-to-static-lib 
@rm -f $@

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

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

$(hide) echo $^ | xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@

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

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

endef



###########################################################