From d83e45ae9c97c0722bf63228a62361a8d1d75595 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 19 Apr 2012 14:46:56 +0300 Subject: Use --as-needed --no-add-needed for Android --- solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 2 ++ solenv/inc/unxandr.mk | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index e10907af03ce..a52a28c7a463 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -51,6 +51,8 @@ gb_CppunitTest_CPPTESTPRECOMMAND := : gb_LinkTarget_LDFLAGS += \ -Wl,-z,defs \ + -Wl,--as-needed \ + -Wl,--no-add-needed define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index 812c9327bf5f..f9408b94a964 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -47,8 +47,11 @@ CDEFS !:= $(subst,-D_REENTRANT, $(CDEFS)) # Thus for Android we never build executable programs, just shared # libraries that the NativeActivity Java code will load. -LINKFLAGSAPPGUI=-shared -LINKFLAGSAPPCUI=-shared +LINKFLAGSAPPGUI=-shared -Wl,--as-needed -Wl,--no-add-needed +LINKFLAGSAPPCUI=-shared -Wl,--as-needed -Wl,--no-add-needed + +LINKFLAGSSHLGUI+= -Wl,--as-needed -Wl,--no-add-needed +LINKFLAGSSHLCUI+= -Wl,--as-needed -Wl,--no-add-needed STDLIBGUIMT+=-llog -landroid -lgnustl_shared STDLIBCUIMT+=-llog -landroid -lgnustl_shared -- cgit v1.2.3