From 85db234cf7fc6b85a9149baf295e35e26e8b1052 Mon Sep 17 00:00:00 2001
From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
Date: Thu, 23 Feb 2012 00:19:12 -0300
Subject: [PATCH] Fix Android build after plugin library refactor

---
 Android.mk      |    2 +-
 src/Makefile.am |   18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index a87e498..2cea25d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@ telepathy-salut-configure-real:
 	PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
 	PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
 	$(TELEPATHY_SALUT_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
-	        --disable-submodules \
+        --disable-submodules --disable-python --disable-avahi-tests \
 		--disable-Werror && \
 	for file in $(TELEPATHY_SALUT_BUILT_SOURCES); do \
 		rm -f $$file && \
diff --git a/src/Makefile.am b/src/Makefile.am
index 7be8412..2ddfb0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,6 +132,10 @@ libsalut_plugins_la_LDFLAGS =                           \
     -no-undefined                                       \
     -avoid-version
 
+libsalut_plugins_android_la_LDFLAGS =                           \
+    -shared                                             \
+    -avoid-version
+
 libsalut_plugins_la_SOURCES =                           \
     $(top_srcdir)/salut/plugin.h                        \
     plugin.c                                            \
@@ -261,13 +265,20 @@ enumtypes.c: $(enumtype_sources) Makefile.in
 	$(enumtype_sources) > $@
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT telepathy-salut -:STATIC salut-convenience \
-	 -:TAGS eng debug \
+	androgenizer -:PROJECT telepathy-salut \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libsalut_convenience_la_SOURCES) \
+	 -:SHARED salut-plugins -:TAGS eng debug \
+	 -:SOURCES $(libsalut_plugins_la_SOURCES)  \
 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+	 -:LDFLAGS $(libsalut_plugins_android_la_LDFLAGS) $(AM_LDFLAGS) \
+	 $(ALL_LIBS) \
+	 -:STATIC salut-convenience -:TAGS eng debug \
+	 -:SOURCES $(libsalut_convenience_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	 $(AM_CFLAGS) \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	 -:SHARED telepathy-salut \
 	 -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
@@ -276,5 +287,6 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	  $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DBUILD_AS_ANDROID_SERVICE \
 	 -:LDFLAGS $(telepathy_salut_android_libs) $(AM_LDFLAGS) \
+	 $(lib_LTLIBRARIES) \
 	 -:LIBFILTER_STATIC salut-convenience \
 	> $@
-- 
1.7.7.3