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

Removed WITH_OPENSSL switch; always build libssl and libcrypto

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-07-20 11:52:44 +02:00
parent bb3dde6983
commit d9d0749de4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
jni/Android.mk
View file

@ -9,7 +9,6 @@ endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
WITH_OPENSSL=1
BUILD_SRTP=1 BUILD_SRTP=1
ZRTP_C_INCLUDE= \ ZRTP_C_INCLUDE= \
$(root-dir)/submodules/externals/libzrtpcpp/src $(root-dir)/submodules/externals/libzrtpcpp/src
@ -32,9 +31,7 @@ include $(root-dir)/submodules/externals/build/exosip/Android.mk
include $(root-dir)/submodules/externals/build/osip/Android.mk include $(root-dir)/submodules/externals/build/osip/Android.mk
ifeq ($(WITH_OPENSSL), 1)
include $(root-dir)/submodules/externals/openssl/Android.mk include $(root-dir)/submodules/externals/openssl/Android.mk
endif
include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk

2
jni/Application.mk
View file

@ -14,7 +14,7 @@ ifeq ($(BUILD_AMR),1)
APP_MODULES += libopencoreamr libmsamr APP_MODULES += libopencoreamr libmsamr
endif endif
ifeq ($(WITH_OPENSSL),1) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES += liblincrypto liblinssl APP_MODULES += liblincrypto liblinssl
endif endif