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

Autodetect need for openssl.

Browse source
This commit is contained in:
Guillaume Beraudo 2013-09-02 11:52:46 +02:00
parent b77c23b889
commit 1f7110f561
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
jni/Android.mk
View file

@ -68,15 +68,16 @@ include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/An
include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
ifeq ($(BUILD_TUNNEL), 1)
# Openssl # Openssl
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),) ifneq ($(BUILD_TUNNEL)$(BUILD_GPLV3_ZRTP), 00)
include $(linphone-root-dir)/submodules/externals/openssl/Android.mk ifeq (,$(DUMP_VAR))
else $(info Openssl is required)
include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk
include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk
endif endif
include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
endif
#tunnel #tunnel
ifeq ($(BUILD_TUNNEL), 1)
include $(linphone-root-dir)/submodules/tunnel/Android.mk include $(linphone-root-dir)/submodules/tunnel/Android.mk
endif endif