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 853de561eda36ee7caf072e92428a02893fc2812..e45a7d9bd3ca21bf0ada1310c76a7f04c1d2b49b 100644 (file)
--- 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 2b58db55486d5f43a2560f32e8badc9511b7c8c5..24f0bc552f2f40dc1ecd7d0a9f6ae163afbd39a6 100644 (file)
--- 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)