From c51a0e50cc7f62be76612aa707debb69818a7875 Mon Sep 17 00:00:00 2001
From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
Date: Mon, 14 Nov 2011 17:16:56 -0300
Subject: [PATCH] Support building for Android, modified from an original
 patch by Derek Foreman

---
 .gitignore                 |    1 +
 Android.mk                 |   31 +++++++++++++++++++++++++++++++
 configure.ac               |    6 ++++++
 telepathy-yell/Makefile.am |   17 +++++++++++++++--
 4 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 Android.mk

diff --git a/.gitignore b/.gitignore
index d652dbe..6784292 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
 /telepathy-yell/*.pc
 /telepathy-yell/extensions.html
 /stamp-h1
+Android.mk
 Makefile
 Makefile.in
 _gen
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..906cd55
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,31 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+TELEPATHY_YELL_BUILT_SOURCES := \
+	telepathy-yell/Android.mk
+
+telepathy-yell-configure-real:
+	cd $(TELEPATHY_YELL_TOP) ; \
+	CC="$(CONFIGURE_CC)" \
+	CFLAGS="$(CONFIGURE_CFLAGS)" \
+	LD=$(TARGET_LD) \
+	LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+	CPP=$(CONFIGURE_CPP) \
+	CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+	PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
+	PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
+	$(TELEPATHY_YELL_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
+		--disable-Werror && \
+	for file in $(TELEPATHY_YELL_BUILT_SOURCES); do \
+		rm -f $$file && \
+		make -C $$(dirname $$file) $$(basename $$file) ; \
+	done
+
+telepathy-yell-configure: telepathy-yell-configure-real
+
+.PHONY: telepathy-yell-configure
+
+CONFIGURE_TARGETS += telepathy-yell-configure
+
+-include $(TELEPATHY_YELL_TOP)/telepathy-yell/Android.mk
diff --git a/configure.ac b/configure.ac
index 1771a64..0560fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,6 +109,12 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+dnl Check for Gio
+PKG_CHECK_MODULES(GIO, [gio-2.0])
+
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
 dnl Check for D-Bus
 PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.13.10])
 
diff --git a/telepathy-yell/Makefile.am b/telepathy-yell/Makefile.am
index 268a992..648d00f 100644
--- a/telepathy-yell/Makefile.am
+++ b/telepathy-yell/Makefile.am
@@ -90,12 +90,14 @@ AM_CFLAGS = \
     $(ERROR_CFLAGS) \
     $(TP_GLIB_CFLAGS) \
     $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS)
+    $(GLIB_CFLAGS) \
+    $(GIO_CFLAGS)
 
 ALL_LIBS = \
     $(DBUS_LIBS) \
     $(GLIB_LIBS) \
-    $(TP_GLIB_LIBS)
+    $(TP_GLIB_LIBS) \
+    $(GIO_LIBS)
 
 distclean-local:
 	rm -rf _gen
@@ -186,3 +188,14 @@ _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
 		--allow-unstable \
 		$< Tpy_Svc_
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+	androgenizer -:PROJECT telepathy-yell -:SHARED telepathy-yell -:TAGS eng debug \
+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(libtelepathy_yell_la_SOURCES) \
+	  $(nodist_libtelepathy_yell_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CFLAGS) \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+	 -:LDFLAGS $(libtelepathy_yell_la_LIBADD) \
+	> $@
-- 
1.7.7.3