summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/jni/Android.mk4
-rwxr-xr-xmain/misc/build-native.sh4
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java1
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java4
4 files changed, 6 insertions, 7 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 342c66dc..e5707c54 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -70,7 +70,7 @@ include $(CLEAR_VARS)
LOCAL_LDLIBS := -lz -lc
LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
LOCAL_SRC_FILES:= minivpn.c dummy.cpp
-LOCAL_MODULE = nopievpn
+LOCAL_MODULE = nopie_openvpn
include $(BUILD_EXECUTABLE)
@@ -81,6 +81,6 @@ LOCAL_CFLAGS = -fPIE
LOCAL_LDFLAGS = -fPIE -pie
LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
LOCAL_SRC_FILES:= minivpn.c dummy.cpp
-LOCAL_MODULE = pievpn
+LOCAL_MODULE = pie_openvpn
include $(BUILD_EXECUTABLE)
diff --git a/main/misc/build-native.sh b/main/misc/build-native.sh
index f9588171..508ad64f 100755
--- a/main/misc/build-native.sh
+++ b/main/misc/build-native.sh
@@ -38,8 +38,8 @@ if [ $? = 0 ]; then
mkdir -p ../ovpnlibs/assets
for i in *
do
- cp -v $i/nopievpn ../ovpnlibs/assets/nopievpn.$i
- cp -v $i/pievpn ../ovpnlibs/assets/pievpn.$i
+ cp -v $i/nopie_openvpn ../ovpnlibs/assets/nopie_openvpn.$i
+ cp -v $i/pie_openvpn ../ovpnlibs/assets/pie_openvpn.$i
done
# Removed compiled openssl libs, will use platform so libs
# Reduces size of apk
diff --git a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index 27c9120a..42f5b85d 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -15,7 +15,6 @@ public class NativeUtils {
static native void jniclose(int fdint);
static {
- System.loadLibrary("stlport_shared");
System.loadLibrary("opvpnutil");
if (Build.VERSION.SDK_INT== Build.VERSION_CODES.JELLY_BEAN)
System.loadLibrary("jbcrypto");
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index d485a687..d3a94c96 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
@@ -20,8 +20,8 @@ import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
public class VPNLaunchHelper {
- private static final String MININONPIEVPN = "nopievpn";
- private static final String MINIPIEVPN = "pievpn";
+ private static final String MININONPIEVPN = "nopie_openvpn";
+ private static final String MINIPIEVPN = "pie_openvpn";
private static final String OVPNCONFIGFILE = "android.conf";