Merge branch 'master' of gitosis@git.savoirfairelinux.com:sflphone-android.git
diff --git a/jni/libdbus-c++-0.9.0-android/src/Android.mk b/jni/libdbus-c++-0.9.0-android/src/Android.mk
index 2cb92a5..f4c81c2 100644
--- a/jni/libdbus-c++-0.9.0-android/src/Android.mk
+++ b/jni/libdbus-c++-0.9.0-android/src/Android.mk
@@ -21,7 +21,7 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../../dbus
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../include \
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../include
LOCAL_MODULE := libdbus-c++-1
LOCAL_CFLAGS += -Wno-unused-parameter -fexceptions
diff --git a/jni/libdbus-c++-0.9.0-android/tools/Android.mk b/jni/libdbus-c++-0.9.0-android/tools/Android.mk
new file mode 100644
index 0000000..b6aaa19
--- /dev/null
+++ b/jni/libdbus-c++-0.9.0-android/tools/Android.mk
@@ -0,0 +1,37 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ xml.cpp xml2cpp.cpp \
+ generate_adaptor.cpp generate_proxy.cpp \
+ generator_utils.cpp
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include \
+ $(LOCAL_PATH)/../../dbus
+
+# do not cross-compile, host tool only is needed
+# FIXME Android NDK cannot build host tool, android sources needed...
+LOCAL_MODULE := dbusxx-xml2cpp
+LOCAL_CFLAGS += -Wall
+LOCAL_STATIC_LIBRARIES += libexpat
+LOCAL_LDFLAGS += -lexpat
+
+include $(BUILD_EXECUTABLE)
+
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := introspect.cpp
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
+# $(LOCAL_PATH)/../../dbus
+
+LOCAL_MODULE := dbusxx-introspect
+LOCAL_CFLAGS += -Wall
+
+LOCAL_STATIC_LIBRARIES += libdbus-c++-1
+LOCAL_LDFLAGS += -ldbus-c++-1
+
+include $(BUILD_EXECUTABLE)
+