Index: target.make
===================================================================
--- target.make	(revision 36343)
+++ target.make	(working copy)
@@ -39,7 +39,11 @@
 # All code we build needs to be thread-safe nowadays
 INTERNAL_CFLAGS = -pthread
 INTERNAL_OBJCFLAGS = -pthread
-INTERNAL_LDFLAGS = -pthread
+ifeq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
+  INTERNAL_LDFLAGS = 
+else
+  INTERNAL_LDFLAGS = -pthread
+endif
 
 ifneq ("$(objc_threaded)","")
   AUXILIARY_OBJC_LIBS += $(objc_threaded)
@@ -1171,3 +1175,54 @@
 # end QNX Neutrino ELF
 #
 ####################################################
+
+####################################################
+#
+# Linux Android
+#
+ifeq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
+HAVE_SHARED_LIBS        = yes
+SHARED_LIB_LINK_CMD     = \
+        $(LD) $(SHARED_LD_PREFLAGS) -shared -Wl,-soname,$(LIBRARY_FILE) \
+           $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) $^ \
+	   $(INTERNAL_LIBRARIES_DEPEND_UPON) \
+	   $(SHARED_LD_POSTFLAGS) \
+	&& (cd $(LIB_LINK_OBJ_DIR); \
+          $(RM_LN_S) $(LIB_LINK_FILE); \
+          if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
+            $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
+            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
+          fi; \
+          $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
+	)
+AFTER_INSTALL_SHARED_LIB_CMD = \
+	(cd $(LIB_LINK_INSTALL_DIR); \
+          $(RM_LN_S) $(LIB_LINK_FILE); \
+          if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
+            $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
+            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
+          fi; \
+          $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
+	)
+AFTER_INSTALL_SHARED_LIB_CHOWN = \
+	(cd $(LIB_LINK_INSTALL_DIR); \
+	chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE); \
+	chown $(CHOWN_TO) $(LIB_LINK_FILE))
+
+OBJ_MERGE_CMD		= \
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+
+SHARED_CFLAGS      += -fPIC
+SHARED_LIBEXT      =  .so
+
+HAVE_BUNDLES       =  yes
+BUNDLE_LD	   =  $(LD)
+BUNDLE_LDFLAGS     += -shared
+ADDITIONAL_LDFLAGS += -rdynamic
+STATIC_LDFLAGS += -static
+endif
+#
+# end Linux Android
+#
+####################################################
+