summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-04-19 14:46:56 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-04-20 00:57:23 +0300
commitd83e45ae9c97c0722bf63228a62361a8d1d75595 (patch)
tree9f0d9d5d32a9b6d65c5dd06829ee190a5c7ae228 /solenv
parent409f117e1c849883f8490e82f4a2323a9dc8ad75 (diff)
Use --as-needed --no-add-needed for Android
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/ANDROID_ARM_GCC.mk2
-rw-r--r--solenv/inc/unxandr.mk7
2 files changed, 7 insertions, 2 deletions
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