diff --git a/client/android/build.gradle b/client/android/build.gradle index ffd00f99..f941293c 100644 --- a/client/android/build.gradle +++ b/client/android/build.gradle @@ -65,7 +65,7 @@ android { compileSdkVersion androidCompileSdkVersion.toInteger() - buildToolsVersion '28.0.3' + //buildToolsVersion '28.0.3' dexOptions { javaMaxHeapSize "3g" @@ -135,11 +135,11 @@ android { // } // } - externalNativeBuild { - cmake { - path 'openvpn/src/main/cpp/CMakeLists.txt' - } - } +// externalNativeBuild { +// cmake { +// path 'openvpn/src/main/cpp/CMakeLists.txt' +// } +// } } diff --git a/client/android/lib/openvpn/arm64-v8a/libjbcrypto.so b/client/android/lib/openvpn/arm64-v8a/libjbcrypto.so index ec89d0f2..5d83f84a 100644 Binary files a/client/android/lib/openvpn/arm64-v8a/libjbcrypto.so and b/client/android/lib/openvpn/arm64-v8a/libjbcrypto.so differ diff --git a/client/android/lib/openvpn/arm64-v8a/libopenvpn.so b/client/android/lib/openvpn/arm64-v8a/libopenvpn.so index 0800b8bd..c5be388e 100644 Binary files a/client/android/lib/openvpn/arm64-v8a/libopenvpn.so and b/client/android/lib/openvpn/arm64-v8a/libopenvpn.so differ diff --git a/client/android/lib/openvpn/arm64-v8a/libopvpnutil.so b/client/android/lib/openvpn/arm64-v8a/libopvpnutil.so index 2814e682..bf79f795 100644 Binary files a/client/android/lib/openvpn/arm64-v8a/libopvpnutil.so and b/client/android/lib/openvpn/arm64-v8a/libopvpnutil.so differ diff --git a/client/android/lib/openvpn/arm64-v8a/libovpn3.so b/client/android/lib/openvpn/arm64-v8a/libovpn3.so new file mode 100644 index 00000000..ad359d3a Binary files /dev/null and b/client/android/lib/openvpn/arm64-v8a/libovpn3.so differ diff --git a/client/android/lib/openvpn/arm64-v8a/libovpnexec.so b/client/android/lib/openvpn/arm64-v8a/libovpnexec.so new file mode 100644 index 00000000..8addf510 Binary files /dev/null and b/client/android/lib/openvpn/arm64-v8a/libovpnexec.so differ diff --git a/client/android/lib/openvpn/armeabi-v7a/libjbcrypto.so b/client/android/lib/openvpn/armeabi-v7a/libjbcrypto.so index 73ccafa8..422d669a 100644 Binary files a/client/android/lib/openvpn/armeabi-v7a/libjbcrypto.so and b/client/android/lib/openvpn/armeabi-v7a/libjbcrypto.so differ diff --git a/client/android/lib/openvpn/armeabi-v7a/libopenvpn.so b/client/android/lib/openvpn/armeabi-v7a/libopenvpn.so index 61d50a32..0943d2b0 100644 Binary files a/client/android/lib/openvpn/armeabi-v7a/libopenvpn.so and b/client/android/lib/openvpn/armeabi-v7a/libopenvpn.so differ diff --git a/client/android/lib/openvpn/armeabi-v7a/libopvpnutil.so b/client/android/lib/openvpn/armeabi-v7a/libopvpnutil.so index 51b4b674..ded4881e 100644 Binary files a/client/android/lib/openvpn/armeabi-v7a/libopvpnutil.so and b/client/android/lib/openvpn/armeabi-v7a/libopvpnutil.so differ diff --git a/client/android/lib/openvpn/armeabi-v7a/libovpn3.so b/client/android/lib/openvpn/armeabi-v7a/libovpn3.so new file mode 100644 index 00000000..b6334b6b Binary files /dev/null and b/client/android/lib/openvpn/armeabi-v7a/libovpn3.so differ diff --git a/client/android/lib/openvpn/armeabi-v7a/libovpnexec.so b/client/android/lib/openvpn/armeabi-v7a/libovpnexec.so new file mode 100644 index 00000000..517a1dd9 Binary files /dev/null and b/client/android/lib/openvpn/armeabi-v7a/libovpnexec.so differ diff --git a/client/android/lib/openvpn/x86/libjbcrypto.so b/client/android/lib/openvpn/x86/libjbcrypto.so index 11094973..67419bc1 100644 Binary files a/client/android/lib/openvpn/x86/libjbcrypto.so and b/client/android/lib/openvpn/x86/libjbcrypto.so differ diff --git a/client/android/lib/openvpn/x86/libopenvpn.so b/client/android/lib/openvpn/x86/libopenvpn.so index c6df45f4..728a395d 100644 Binary files a/client/android/lib/openvpn/x86/libopenvpn.so and b/client/android/lib/openvpn/x86/libopenvpn.so differ diff --git a/client/android/lib/openvpn/x86/libopvpnutil.so b/client/android/lib/openvpn/x86/libopvpnutil.so index 6aa29165..3329fe9a 100644 Binary files a/client/android/lib/openvpn/x86/libopvpnutil.so and b/client/android/lib/openvpn/x86/libopvpnutil.so differ diff --git a/client/android/lib/openvpn/x86/libovpn3.so b/client/android/lib/openvpn/x86/libovpn3.so new file mode 100644 index 00000000..5ae500a4 Binary files /dev/null and b/client/android/lib/openvpn/x86/libovpn3.so differ diff --git a/client/android/lib/openvpn/x86/libovpnexec.so b/client/android/lib/openvpn/x86/libovpnexec.so new file mode 100644 index 00000000..29b4cc2b Binary files /dev/null and b/client/android/lib/openvpn/x86/libovpnexec.so differ diff --git a/client/android/lib/openvpn/x86_64/libjbcrypto.so b/client/android/lib/openvpn/x86_64/libjbcrypto.so index df23d13c..1158d07a 100644 Binary files a/client/android/lib/openvpn/x86_64/libjbcrypto.so and b/client/android/lib/openvpn/x86_64/libjbcrypto.so differ diff --git a/client/android/lib/openvpn/x86_64/libopenvpn.so b/client/android/lib/openvpn/x86_64/libopenvpn.so index cb92f1ea..a30256eb 100644 Binary files a/client/android/lib/openvpn/x86_64/libopenvpn.so and b/client/android/lib/openvpn/x86_64/libopenvpn.so differ diff --git a/client/android/lib/openvpn/x86_64/libopvpnutil.so b/client/android/lib/openvpn/x86_64/libopvpnutil.so index ea17eb3d..cdbfaae8 100644 Binary files a/client/android/lib/openvpn/x86_64/libopvpnutil.so and b/client/android/lib/openvpn/x86_64/libopvpnutil.so differ diff --git a/client/android/lib/openvpn/x86_64/libovpn3.so b/client/android/lib/openvpn/x86_64/libovpn3.so new file mode 100644 index 00000000..00e792ed Binary files /dev/null and b/client/android/lib/openvpn/x86_64/libovpn3.so differ diff --git a/client/android/lib/openvpn/x86_64/libovpnexec.so b/client/android/lib/openvpn/x86_64/libovpnexec.so new file mode 100644 index 00000000..a315dd2f Binary files /dev/null and b/client/android/lib/openvpn/x86_64/libovpnexec.so differ diff --git a/client/client.pro b/client/client.pro index 203d6853..93798b56 100644 --- a/client/client.pro +++ b/client/client.pro @@ -194,7 +194,7 @@ android { android/gradlew \ android/gradlew.bat \ android/res/values/libs.xml \ - android/src/org/amnezia/vpn/OpenVPNThreadv3.kt \ + android/src/org/amnezia/vpn/OpenVPNThreadv3.kt \ android/src/org/amnezia/vpn/VpnService.kt \ android/src/org/amnezia/vpn/VpnServiceBinder.kt \ android/src/org/amnezia/vpn/qt/VPNPermissionHelper.kt @@ -205,16 +205,14 @@ android { ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so + ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so + ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so + ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so } - } REPC_REPLICA += ../ipc/ipc_interface.rep !ios: REPC_REPLICA += ../ipc/ipc_process_interface.rep - -ANDROID_EXTRA_LIBS = C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/wireguard/x86_64/libwg.so C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/wireguard/x86_64/libwg-go.so C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/wireguard/x86_64/libwg-quick.so C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/openvpn/x86_64/libjbcrypto.so C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/openvpn/x86_64/libopenvpn.so C:/Users/nikita.rozov/Documents/desktop-client/client/android/lib/openvpn/x86_64/libopvpnutil.so $$PWD/../../../../../Android/Sdk/android_openssl/Qt-5.12.4_5.13.0/x86_64/libcrypto.so $$PWD/../../../../../Android/Sdk/android_openssl/Qt-5.12.4_5.13.0/x86_64/libssl.so - -