feat: openvpn add support android

This commit is contained in:
NickVs2015
2026-03-09 22:55:05 +03:00
parent 2a6960a4fb
commit 041d0fcab5
3 changed files with 83 additions and 8 deletions

View File

@@ -42,14 +42,6 @@ set(SOURCES ${SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/core/installedAppsImageProvider.cpp
)
foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
set_property(TARGET ${PROJECT} PROPERTY QT_ANDROID_EXTRA_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libck-ovpn-plugin.so
${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpn3.so
${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so
${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so
)
endforeach()
find_package(awg-android REQUIRED)
set(LIBS ${LIBS} amnezia::awg-android)
@@ -57,3 +49,11 @@ set_property(TARGET ${PROJECT} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${AMNEZIA_A
find_package(amnezia-libxray REQUIRED)
file(COPY ${AMNEZIA_LIBXRAY_PATH} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/android/xray/libXray)
find_package(openvpn-pt-android REQUIRED)
set_property(TARGET ${PROJECT} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS
${AMNEZIA_ANDROID_CK_OVPN_PLUGIN_PATH}
${AMNEZIA_ANDROID_OVPN3_PATH}
${AMNEZIA_ANDROID_OVPNUTIL_PATH}
${AMNEZIA_ANDROID_RSAPSS_PATH}
)

View File

@@ -27,6 +27,7 @@ class AmneziaVPN(ConanFile):
if os == "Android":
self.requires("amnezia-libxray/1.0.0")
self.requires("awg-android/1.1.7")
self.requires("openvpn-pt-android/1.0.0")
self.requires("libssh-local/0.11.3")
self.requires("openssl/3.5.5")

View File

@@ -0,0 +1,74 @@
from conan import ConanFile
from conan.tools.cmake import cmake_layout, CMake, CMakeToolchain
from conan.tools.files import copy
from conan.tools.scm import Git
from conan.errors import ConanInvalidConfiguration
import os
class OpenvpnPtAndroid(ConanFile):
name = "openvpn-pt-android"
version = "1.0.0"
package_type = "shared-library"
settings = "os", "arch", "build_type", "compiler"
# Conan arch → Android ABI
_arch_map = {
"armv8": "arm64-v8a",
"armv7": "armeabi-v7a",
"x86": "x86",
"x86_64": "x86_64",
}
def layout(self):
cmake_layout(self)
def build_requirements(self):
self.tool_requires("swig/4.1.1")
self.tool_requires("go/1.26.0")
def validate(self):
if self.settings.os != "Android":
raise ConanInvalidConfiguration(f"{self.name} only supports Android, got {self.settings.os}")
if str(self.settings.arch) not in self._arch_map:
raise ConanInvalidConfiguration(f"{self.name} does not support arch {self.settings.arch}")
def _android_abi(self):
return self._arch_map[str(self.settings.arch)]
def source(self):
git = Git(self)
git.clone(
url="https://github.com/amnezia-vpn/openvpn-pt-android.git",
target=".",
args=["--recurse-submodules", "--branch", "update-ovpn3"]
)
def generate(self):
tc = CMakeToolchain(self)
tc.variables["ANDROID_PACKAGE_NAME"] = "org.amnezia.vpn"
tc.variables["ANDROID_PLATFORM"] = 24
tc.generate()
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build(target=["ck_ovpn_plugin_go", "ovpn3", "ovpnutil", "rsapss"])
def package(self):
build_dir = self.build_folder
copy(self, "libck-ovpn-plugin.so", src=build_dir, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
for binary in ("ovpn3", "ovpnutil", "rsapss"):
copy(self, f"lib{binary}.so", src=build_dir, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
def package_info(self):
self.cpp_info.set_property("cmake_target_name", "amnezia::openvpn-pt-android")
self.cpp_info.libs = ["ck-ovpn-plugin", "ovpn3", "ovpnutil", "rsapss"]
self.cpp_info.set_property("cmake_extra_variables", {
"AMNEZIA_ANDROID_CK_OVPN_PLUGIN_PATH": os.path.join(self.package_folder, "lib", "libck-ovpn-plugin.so"),
"AMNEZIA_ANDROID_OVPN3_PATH": os.path.join(self.package_folder, "lib", "libovpn3.so"),
"AMNEZIA_ANDROID_OVPNUTIL_PATH": os.path.join(self.package_folder, "lib", "libovpnutil.so"),
"AMNEZIA_ANDROID_RSAPSS_PATH": os.path.join(self.package_folder, "lib", "librsapss.so"),
})