diff --git a/.gitmodules b/.gitmodules index 755ba36e3..a4ce1de2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "submodules/msx264"] path = submodules/msx264 url = git://git.linphone.org/msx264.git +[submodule "submodules/externals/openssl"] + path = submodules/externals/openssl + url = git://android.git.kernel.org/platform/external/openssl.git diff --git a/jni/Android.mk b/jni/Android.mk old mode 100644 new mode 100755 index f3ff0eb5b..87a283b15 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -12,6 +12,8 @@ include $(root-dir)/submodules/externals/build/exosip/Android.mk include $(root-dir)/submodules/externals/build/osip/Android.mk +include $(root-dir)/submodules/externals/openssl/Android.mk + include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk diff --git a/jni/Application.mk b/jni/Application.mk index ed5a56a9b..d08417909 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,5 +1,7 @@ APP_PROJECT_PATH := $(call my-dir)/../ -APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone +APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone libcrypto +APP_STL := stlport_static + ifeq ($(RING),yes) APP_MODULES += libring diff --git a/submodules/externals/openssl b/submodules/externals/openssl new file mode 160000 index 000000000..bbb2e706f --- /dev/null +++ b/submodules/externals/openssl @@ -0,0 +1 @@ +Subproject commit bbb2e706f6d9aeb29f7119ca3edd87e9a578222a