From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 27 Mar 2014 17:04:18 +0000 (+0100)
Subject: android: Use static version of libcrypto
X-Git-Tag: 5.2.0dr2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=806476407098b385f0cc392ac2dc0f3c344e6755;p=thirdparty%2Fstrongswan.git

android: Use static version of libcrypto

System.loadLibrary() searches in system directories first (at least in
recent releases), that is, our own build wouldn't actually get used.
---

diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index 853de561ed..e45a7d9bd3 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -660,7 +660,6 @@ public class CharonVpnService extends VpnService implements Runnable
 	 */
 	static
 	{
-		System.loadLibrary("crypto");
 		System.loadLibrary("strongswan");
 
 		if (MainActivity.USE_BYOD)
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 2b58db5548..24f0bc552f 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -70,7 +70,7 @@ LOCAL_SRC_FILES += $(call add_plugin, nonce)
 LOCAL_SRC_FILES += $(call add_plugin, openssl)
 ifneq ($(call plugin_enabled, openssl),)
 LOCAL_C_INCLUDES += $(openssl_PATH)
-LOCAL_SHARED_LIBRARIES += libcrypto
+LOCAL_STATIC_LIBRARIES += libcrypto_static
 endif
 
 LOCAL_SRC_FILES += $(call add_plugin, pem)