Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conditionnal openssl build + fork openssl.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-03-31 15:00:44 +02:00
parent 1d5ce7e7fc
commit dcc1206c05
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Android.mk
View file

@ -16,7 +16,9 @@ include $(root-dir)/submodules/externals/build/exosip/Android.mk
include $(root-dir)/submodules/externals/build/osip/Android.mk
ifeq ($(WITH_OPENSSL), 1)
include $(root-dir)/submodules/externals/openssl/Android.mk
endif
include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk

7
jni/Application.mk
View file

@ -1,8 +1,13 @@
APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone libcrypto
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone
APP_STL := stlport_static
ifeq ($(WITH_OPENSSL),1)
APP_MODULES += libcrypto libssl
endif
ifeq ($(RING),yes)
APP_MODULES += libring
endif

2
submodules/externals/openssl vendored

@ -1 +1 @@
Subproject commit bbb2e706f6d9aeb29f7119ca3edd87e9a578222a
Subproject commit 9d2527ceee764ce86793861998439712a37ec71b