From 806476407098b385f0cc392ac2dc0f3c344e6755 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 27 Mar 2014 18:04:18 +0100 Subject: [PATCH] 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. --- .../src/org/strongswan/android/logic/CharonVpnService.java | 1 - src/libstrongswan/Android.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 853de561e..e45a7d9bd 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 2b58db554..24f0bc552 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)