diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake index d74b74d47..d2b339faf 100644 --- a/client/cmake/android.cmake +++ b/client/cmake/android.cmake @@ -44,7 +44,6 @@ set(SOURCES ${SOURCES} foreach(abi IN ITEMS ${QT_ANDROID_ABIS}) set_property(TARGET ${PROJECT} PROPERTY QT_ANDROID_EXTRA_LIBS - # ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-go.so ${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 @@ -54,6 +53,7 @@ endforeach() find_package(awg-android REQUIRED) set(LIBS ${LIBS} amnezia::awg-android) +set_property(TARGET ${PROJECT} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${AMNEZIA_ANDROID_LIBWG_PATH} ${AMNEZIA_ANDROID_LIBWG_QUICK_PATH}) find_package(amnezia-libxray REQUIRED) file(COPY ${AMNEZIA_LIBXRAY_PATH} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/android/xray/libXray) diff --git a/recipes/amnezia-libxray/conanfile.py b/recipes/amnezia-libxray/conanfile.py index fbcdc7fb6..b3cd28aff 100644 --- a/recipes/amnezia-libxray/conanfile.py +++ b/recipes/amnezia-libxray/conanfile.py @@ -2,7 +2,6 @@ from conan import ConanFile from conan.tools.files import get, copy from conan.tools.layout import basic_layout from conan.errors import ConanInvalidConfiguration -from conan.tools.env import VirtualBuildEnv import os import stat @@ -28,9 +27,6 @@ class AmneziaLibxray(ConanFile): sha256="0c50c5acd5063a9fc3cfbb5b3e11481d30cfa3762b3cb1d72130248ff498e9df", strip_root=True ) - def generate(self): - env = VirtualBuildEnv(self) - def _patch_sources(self): build_path = os.path.join(self.build_folder, "build.sh") build_stat = os.stat(build_path) @@ -44,4 +40,6 @@ class AmneziaLibxray(ConanFile): copy(self, "libxray.aar", src=self.build_folder, dst=os.path.join(self.package_folder, "aar")) def package_info(self): - self.env_info["AMNEZIA_LIBXRAY_PATH"] = os.path.join(self.package_folder, "aar", "libxray.aar") \ No newline at end of file + self.cpp_info.set_property("cmake_extra_variables", { + "AMNEZIA_LIBXRAY_PATH": os.path.join(self.package_folder, "aar", "libxray.aar"), + }) diff --git a/recipes/awg-android/conanfile.py b/recipes/awg-android/conanfile.py index 60982174e..1fdcdcdfe 100644 --- a/recipes/awg-android/conanfile.py +++ b/recipes/awg-android/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.tools.cmake import cmake_layout, CMake, CMakeToolchain -from conan.tools.files import copy, collect_libs, replace_in_file +from conan.tools.files import copy, replace_in_file from conan.errors import ConanInvalidConfiguration from conan.tools.scm import Git @@ -65,8 +65,14 @@ class AwgAndroid(ConanFile): def package(self): copy(self, "libwg-go.h", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "include")) - copy(self, "libwg*.so", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "lib")) + copy(self, "libwg-go.so", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "lib")) + copy(self, "libwg.so", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "bin")) + copy(self, "libwg-quick.so", src=os.path.join(self.build_folder, "out"), dst=os.path.join(self.package_folder, "bin")) def package_info(self): self.cpp_info.set_property("cmake_target_name", "amnezia::awg-android") - self.cpp_info.libs = collect_libs(self) + self.cpp_info.libs = [ "wg-go" ] + self.cpp_info.set_property("cmake_extra_variables", { + "AMNEZIA_ANDROID_LIBWG_PATH": os.path.join(self.package_folder, "bin", "libwg.so"), + "AMNEZIA_ANDROID_LIBWG_QUICK_PATH": os.path.join(self.package_folder, "bin", "libwg-quick.so"), + }) diff --git a/recipes/tun2socks/conanfile.py b/recipes/tun2socks/conanfile.py index f4b19012e..d5b249567 100644 --- a/recipes/tun2socks/conanfile.py +++ b/recipes/tun2socks/conanfile.py @@ -34,7 +34,6 @@ class Tun2Socks(ConanFile): get(self, f"https://github.com/xjasonlyu/tun2socks/archive/refs/tags/v{self.version}.zip", sha256="a7ef9cec1c30dfe9971af89a8aac767fd3d2a4df833e92b635642c2f0204c701", strip_root=True ) - def configure(self): self._goos = self._os_map.get(str(self.settings.os))