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

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

Merge "Fix for duplicate names in whole static libs"

parents 294301bb 0e5ce8be

core/combo/select.mk

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ $(combo_var_prefix)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar 
$(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing

$(combo_var_prefix)GLOBAL_CPPFLAGS :=

$(combo_var_prefix)GLOBAL_LDFLAGS :=

$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD

$(combo_var_prefix)GLOBAL_ARFLAGS := cqsPD

$(combo_var_prefix)GLOBAL_LD_DIRS :=



$(combo_var_prefix)EXECUTABLE_SUFFIX :=

core/definitions.mk

+20 −20
Original line number Diff line number Diff line
@@ -1167,16 +1167,16 @@ 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)]"

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

    rm -rf $$ldir; \

    mkdir -p $$ldir; \

    filelist=; \

    for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1)`; do \

        $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) p $(1) $$f > $$ldir/$$f; \

        filelist="$$filelist $$ldir/$$f"; \

$(hide) \

    for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) | sort | uniq`; do \

        i=0; \

        for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) $$f`; do \

            i=$$(($$i + 1)); \

            $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) xN $$i $(1) $$f; \

            $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \

                $(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) $@ $$f; \

        done ; \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \

        $(PRIVATE_ARFLAGS) $@ $$filelist

    done ;



endef
@@ -1204,16 +1204,16 @@ 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)]"

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

    rm -rf $$ldir; \

    mkdir -p $$ldir; \

    filelist=; \

    for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$'`; do \

        $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) p $(1) $$f > $$ldir/$$f; \

        filelist="$$filelist $$ldir/$$f"; \

$(hide) \

    for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$' | sort | uniq`; do \

        i=0; \

        for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) $$f`; do \

            i=$$(($$i + 1)); \

            $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) xN $$i $(1) $$f; \

            $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) \

                $(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) $@ $$f; \

        done ; \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) \

        $(PRIVATE_ARFLAGS) $@ $$filelist

    done ;



endef