StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""

Browse Source 
* commit '3805f619156163eab8ad92fd51b4a431be1287bd':
  Revert "Fix for duplicate names in whole static libs"
This commit is contained in:
Dan Albert
2014-05-27 19:44:19 +00:00
committed by Android Git Automerger
parent 212772f632 3805f61915
commit a5b0b1303d
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/select.mk
View File

@@ -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)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
$(combo_var_prefix)GLOBAL_CPPFLAGS := $(combo_var_prefix)GLOBAL_CPPFLAGS :=
$(combo_var_prefix)GLOBAL_LDFLAGS := $(combo_var_prefix)GLOBAL_LDFLAGS :=
$(combo_var_prefix)GLOBAL_ARFLAGS := cqsPD $(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
$(combo_var_prefix)GLOBAL_LD_DIRS := $(combo_var_prefix)GLOBAL_LD_DIRS :=
$(combo_var_prefix)EXECUTABLE_SUFFIX := $(combo_var_prefix)EXECUTABLE_SUFFIX :=

40
core/definitions.mk
View File

@@ -1167,16 +1167,16 @@ endef
# $(1): the full path of the source static library. # $(1): the full path of the source static library.
define _extract-and-include-single-target-whole-static-lib define _extract-and-include-single-target-whole-static-lib
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" @echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
$(hide) \ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) | sort | uniq`; do \ rm -rf $$ldir; \
i=0; \ mkdir -p $$ldir; \
for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) $$f`; do \ filelist=; \
i=$$(($$i + 1)); \ for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1)`; do \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) xN $$i $(1) $$f; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) p $(1) $$f > $$ldir/$$f; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \ filelist="$$filelist $$ldir/$$f"; \
$(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) $@ $$f; \ done ; \
done ; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
done ; $(PRIVATE_ARFLAGS) $@ $$filelist
endef endef
@@ -1204,16 +1204,16 @@ endef
# $(1): the full path of the source static library. # $(1): the full path of the source static library.
define _extract-and-include-single-host-whole-static-lib define _extract-and-include-single-host-whole-static-lib
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" @echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
$(hide) \ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$' | sort | uniq`; do \ rm -rf $$ldir; \
i=0; \ mkdir -p $$ldir; \
for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) $$f`; do \ filelist=; \
i=$$(($$i + 1)); \ for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$'`; do \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) xN $$i $(1) $$f; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) p $(1) $$f > $$ldir/$$f; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) \ filelist="$$filelist $$ldir/$$f"; \
$(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) $@ $$f; \ done ; \
done ; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) \
done ; $(PRIVATE_ARFLAGS) $@ $$filelist
endef endef