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

Conflicts:
	jni/Application.mk
	jni/sflphone

jni/Application.mk

@@ -13,6 +13,8 @@ APP_OPTIM := release
 #APP_MODULES += dbus-daemon
 #APP_MODULES += dbus-monitor
 #APP_MODULES += dbus-send
+#APP_MODULES += libdbus
+#APP_MODULES += libdbus-tools-common
 
 #APP_MODULES += libdbus-c++-1
 #APP_MODULES += libdbus-glue
@@ -35,7 +37,7 @@ APP_MODULES += libcodec_alaw
 #APP_MODULES += libhistory
 #APP_MODULES += libhooks
 
-APP_MODULES += libsflphone
+#APP_MODULES += libsflphone
 APP_MODULES += sflphoned
 
 APP_STL := gnustl_shared

jni/ccrtp-1.8.0-android/src/Android.mk

@@ -17,7 +17,8 @@ LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc \
 		    $(LOCAL_PATH)/../../openssl/include
 LOCAL_MODULE     := libccrtp1
-LOCAL_SHARED_LIBRARIES := libccgnu2
+LOCAL_SHARED_LIBRARIES += libccgnu2 \
+						  libssl_shared
 LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
                     -L$(APP_PROJECT_PATH)/obj/local/armeabi \
                     -lccgnu2 \

jni/dbus/bus/Android.mk

@@ -6,7 +6,7 @@ LOCAL_C_INCLUDES:= \
 	$(call include-path-for, dbus) \
 	$(call include-path-for, dbus)/dbus \
 	$(LOCAL_PATH)/.. \
-	$(LOCAL_PATH)/../../libexpat \
+	$(LOCAL_PATH)/../../libexpat
 
 LOCAL_CFLAGS:=-O3
 LOCAL_CFLAGS+=-DDBUS_COMPILATION
@@ -42,7 +42,7 @@ LOCAL_SRC_FILES:= \
 	utils.c
 
 LOCAL_SHARED_LIBRARIES := \
-	libexpat \
+	libexpat_shared \
 	libdbus
 
 LOCAL_MODULE:=dbus-daemon

jni/openssl/ssl/Android.mk

@@ -75,7 +75,8 @@ LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
 LOCAL_SHARED_LIBRARIES += libcrypto
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
+LOCAL_MODULE:= libssl_shared
+LOCAL_MODULE_FILENAME := libssl
 include $(BUILD_SHARED_LIBRARY)
 
 #######################################