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

Commit a8abcb36 authored Oct 14, 2014 by Dan Albert

resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp

Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea

parents 9b5e64a8 852fc3e6

core/combo/TARGET_linux-arm.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -257,12 +257,13 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \
		$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-arm64.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -223,12 +223,13 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \
		$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-mips.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -229,12 +229,13 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \
		$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-mips64.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -233,12 +233,13 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \
		$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-x86.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -210,9 +210,12 @@ $(hide) $(PRIVATE_CXX) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))