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

Commit 9ca21644 authored by Colin Cross's avatar Colin Cross Committed by Ed Heyl
Browse files

build: Fix including WHOLE_STATIC_LIBRARIES in static libraries 

Static libraries that include other static libraries were being incorrectly
built with .a files inside the top level .a file, as well as the .o files
that were extracted from the component .a files.  This patch fixes the
final ar call to only add .o files to the archive.

Change-Id: Ic1ff025129e3c379fa56b4da2f09e9f16ea3c4fb
parent 93b01600

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



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