Merge branch 'master' of git.savoirfairelinux.com:sflphone-android

jni/Application.mk

@@ -35,4 +35,7 @@ APP_MODULES += libaudio
 APP_MODULES += libhistory
 APP_MODULES += libhooks
 
+APP_MODULES += libsflphone
+APP_MODULES += sflphoned
+
 APP_STL := gnustl_shared

jni/libdbus-c++-0.9.0-android/src/Android.mk

@@ -24,8 +24,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include \
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../include
 
 LOCAL_MODULE := libdbus-c++-1
-LOCAL_CFLAGS += -Wno-unused-parameter -fexceptions
-LOCAL_STATIC_LIBRARIES += libdbus
+LOCAL_CFLAGS += -Wno-unused-parameter -fexceptions -frtti
+LOCAL_SHARED_LIBRARIES += libdbus
 
 include $(BUILD_SHARED_LIBRARY)
 

jni/libyaml/Android.mk

@@ -14,5 +14,4 @@ LOCAL_SRC_FILES  := api.c reader.c scanner.c \
                     parser.c loader.c writer.c emitter.c dumper.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
 
-#include $(BUILD_STATIC_LIBRARY) 
 include $(BUILD_SHARED_LIBRARY)

sflphone @ 0bd2b677

-Subproject commit 934633e8985ce19b605f6eeadca6202a4ca48a8b
+Subproject commit 0bd2b677c246dc2a2069eee185a2c9b972052b69