From 8e5954edd17e9efd150b37213482e8abdbf57f5a Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 22 Nov 2016 17:12:25 +0100
Subject: Really statically link closes #563

---
 main/jni/Android.mk       | 4 ++--
 main/jni/Application.mk   | 2 +-
 main/misc/build-native.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 361f2184..0b8a2ee4 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -69,7 +69,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -lz  -lc 
-LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
+LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn
 LOCAL_SRC_FILES:= minivpn.c dummy.cpp
 LOCAL_MODULE = nopie_openvpn
 include $(BUILD_EXECUTABLE)
@@ -80,7 +80,7 @@ LOCAL_LDLIBS := -lz  -lc
 LOCAL_CFLAGS= -fPIE -pie
 LOCAL_CFLAGS = -fPIE
 LOCAL_LDFLAGS = -fPIE -pie
-LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
+LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn
 LOCAL_SRC_FILES:= minivpn.c dummy.cpp
 LOCAL_MODULE = pie_openvpn
 include $(BUILD_EXECUTABLE)
diff --git a/main/jni/Application.mk b/main/jni/Application.mk
index dd021c20..9e866600 100644
--- a/main/jni/Application.mk
+++ b/main/jni/Application.mk
@@ -9,6 +9,6 @@ APP_STL:=stlport_static
 
 #LOCAL_ARM_MODE := arm
 
-NDK_TOOLCHAIN_VERSION=4.9
+#NDK_TOOLCHAIN_VERSION=4.9
 APP_CPPFLAGS += -std=c++1y
 APP_CFLAGS += -funwind-tables
diff --git a/main/misc/build-native.sh b/main/misc/build-native.sh
index 892b075d..75706e21 100755
--- a/main/misc/build-native.sh
+++ b/main/misc/build-native.sh
@@ -44,7 +44,7 @@ if [ $? = 0 ]; then
 	# Removed compiled openssl libs, will use platform so libs 
 	# Reduces size of apk
     #
-	rm -v */libcrypto.so */libssl.so
+	rm -v */libcrypto.so */libssl.so || true
 
   	for arch in *
   	do
-- 
cgit v1.2.3