From d9d0749de48d0861a55c03fc96990578c2adf51e Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Wed, 20 Jul 2011 11:52:44 +0200
Subject: [PATCH] Removed WITH_OPENSSL switch; always build libssl and
 libcrypto

---
 jni/Android.mk     | 3 ---
 jni/Application.mk | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index bc5a97564..47792b3da 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -9,7 +9,6 @@ endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
-WITH_OPENSSL=1
 BUILD_SRTP=1
 ZRTP_C_INCLUDE= \
 	$(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
 
-ifeq ($(WITH_OPENSSL), 1)
 include $(root-dir)/submodules/externals/openssl/Android.mk
-endif
 
 include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
diff --git a/jni/Application.mk b/jni/Application.mk
index b4fa3a810..efaf31b67 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -14,7 +14,7 @@ ifeq ($(BUILD_AMR),1)
 APP_MODULES += libopencoreamr libmsamr
 endif
 
-ifeq ($(WITH_OPENSSL),1)
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 APP_MODULES += liblincrypto liblinssl
 endif