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

Commit 01c17f03 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 

* commit 'e58868ab':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
parents 0a7e26e2 e58868ab

core/combo/TARGET_linux-arm.mk

+2 −2
Original line number Diff line number Diff line
@@ -245,11 +245,11 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef
@@ -270,11 +270,11 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef

core/combo/TARGET_linux-mips.mk

+2 −2
Original line number Diff line number Diff line
@@ -236,11 +236,11 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef
@@ -261,11 +261,11 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef