OpenVPN libs added for Android

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'
+//       }
+//   }
 }
 
 

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
-
-