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.
This commit is contained in:
@@ -660,7 +660,6 @@ public class CharonVpnService extends VpnService implements Runnable
|
|||||||
*/
|
*/
|
||||||
static
|
static
|
||||||
{
|
{
|
||||||
System.loadLibrary("crypto");
|
|
||||||
System.loadLibrary("strongswan");
|
System.loadLibrary("strongswan");
|
||||||
|
|
||||||
if (MainActivity.USE_BYOD)
|
if (MainActivity.USE_BYOD)
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ LOCAL_SRC_FILES += $(call add_plugin, nonce)
|
|||||||
LOCAL_SRC_FILES += $(call add_plugin, openssl)
|
LOCAL_SRC_FILES += $(call add_plugin, openssl)
|
||||||
ifneq ($(call plugin_enabled, openssl),)
|
ifneq ($(call plugin_enabled, openssl),)
|
||||||
LOCAL_C_INCLUDES += $(openssl_PATH)
|
LOCAL_C_INCLUDES += $(openssl_PATH)
|
||||||
LOCAL_SHARED_LIBRARIES += libcrypto
|
LOCAL_STATIC_LIBRARIES += libcrypto_static
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LOCAL_SRC_FILES += $(call add_plugin, pem)
|
LOCAL_SRC_FILES += $(call add_plugin, pem)
|
||||||
|
|||||||
Reference in New Issue
Block a user