From a3c01095c0bb8c37fd8ddb9ec7f4e2df5085a81a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 19 Dec 2011 19:27:31 +0200
Subject: Add gb_STDLIBS and override gb_Library_PLAINLIBS_NONE

---
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index b9235d267304..309dc6ac5d1d 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -33,6 +33,15 @@ gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+# Link almost everything with -lgnustl_shared
+gb_STDLIBS := \
+	gnustl_shared
+
+gb_Library_PLAINLIBS_NONE := \
+	android \
+	gnustl_shared \
+	log \
+
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 
@@ -58,7 +67,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
 		$(LIBS) \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
-		-llog -landroid -lgnustl_shared \
 		-o $(1))
 endef
 
-- 
cgit