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

Commit de36cd72 authored by Ying Wang's avatar Ying Wang
Browse files

Apply LOCAL_LDLIBS to target build rules too. 

Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.

Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
parent a16583a0

core/combo/TARGET_linux-arm.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -264,7 +265,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

core/combo/TARGET_linux-arm64.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -180,7 +180,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define transform-o-to-executable-inner

define transform-o-to-executable-inner
@@ -204,7 +205,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define transform-o-to-static-executable-inner

define transform-o-to-static-executable-inner

core/combo/TARGET_linux-mips.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -230,7 +230,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -255,7 +256,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

core/combo/TARGET_linux-mips64.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define transform-o-to-executable-inner

define transform-o-to-executable-inner
@@ -264,7 +265,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define transform-o-to-static-executable-inner

define transform-o-to-static-executable-inner

core/combo/TARGET_linux-x86.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -194,7 +194,8 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -219,7 +220,8 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

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

	$(PRIVATE_LDLIBS)

endef

endef





define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner