summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/main/cpp/CMakeLists.txt10
-rw-r--r--main/src/main/cpp/ovpnutil/jniglue.c (renamed from main/src/main/cpp/opvpnutil/jniglue.c)0
-rw-r--r--main/src/main/cpp/ovpnutil/jniglue.h (renamed from main/src/main/cpp/opvpnutil/jniglue.h)0
-rw-r--r--main/src/main/cpp/ovpnutil/scan_ifs.c (renamed from main/src/main/cpp/opvpnutil/scan_ifs.c)0
-rw-r--r--main/src/main/cpp/ovpnutil/sslspeed.c (renamed from main/src/main/cpp/opvpnutil/sslspeed.c)0
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java2
6 files changed, 6 insertions, 6 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index e06c76ac..4057b4e2 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -98,16 +98,16 @@ else ()
message("Not budiling OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()
-add_library(opvpnutil SHARED opvpnutil/jniglue.c opvpnutil/scan_ifs.c)
-target_compile_definitions(opvpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
+add_library(ovpnutil SHARED ovpnutil/jniglue.c ovpnutil/scan_ifs.c)
+target_compile_definitions(ovpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
-DOPENVPN2_GIT_REVISION=\"${OPENVPN2_GIT}\"
-DOPENVPN3_GIT_REVISION=\"${OPENVPN3_GIT}\"
)
-target_link_libraries(opvpnutil log)
+target_link_libraries(ovpnutil log)
if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
- add_library(osslspeedtest SHARED opvpnutil/sslspeed.c)
+ add_library(osslspeedtest SHARED ovpnutil/sslspeed.c)
target_link_libraries(osslspeedtest log crypto ssl)
else ()
message("Not budiling SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
@@ -268,6 +268,6 @@ add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD
)
# Hack that these targets are really executed
-add_dependencies(opvpnutil pie_openvpn.${ANDROID_ABI} nopie_openvpn.${ANDROID_ABI})
+add_dependencies(ovpnutil pie_openvpn.${ANDROID_ABI} nopie_openvpn.${ANDROID_ABI})
add_dependencies(pie_openvpn.${ANDROID_ABI} makeassetdir)
add_dependencies(nopie_openvpn.${ANDROID_ABI} makeassetdir)
diff --git a/main/src/main/cpp/opvpnutil/jniglue.c b/main/src/main/cpp/ovpnutil/jniglue.c
index 264b18a8..264b18a8 100644
--- a/main/src/main/cpp/opvpnutil/jniglue.c
+++ b/main/src/main/cpp/ovpnutil/jniglue.c
diff --git a/main/src/main/cpp/opvpnutil/jniglue.h b/main/src/main/cpp/ovpnutil/jniglue.h
index 8f813b64..8f813b64 100644
--- a/main/src/main/cpp/opvpnutil/jniglue.h
+++ b/main/src/main/cpp/ovpnutil/jniglue.h
diff --git a/main/src/main/cpp/opvpnutil/scan_ifs.c b/main/src/main/cpp/ovpnutil/scan_ifs.c
index 85021d88..85021d88 100644
--- a/main/src/main/cpp/opvpnutil/scan_ifs.c
+++ b/main/src/main/cpp/ovpnutil/scan_ifs.c
diff --git a/main/src/main/cpp/opvpnutil/sslspeed.c b/main/src/main/cpp/ovpnutil/sslspeed.c
index 1881998e..1881998e 100644
--- a/main/src/main/cpp/opvpnutil/sslspeed.c
+++ b/main/src/main/cpp/ovpnutil/sslspeed.c
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 d6c1cdb9..d8315c9f 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -39,7 +39,7 @@ public class NativeUtils {
static {
if (!isRoboUnitTest()) {
- System.loadLibrary("opvpnutil");
+ System.loadLibrary("ovpnutil");
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN)
System.loadLibrary("jbcrypto");