andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Setting of minimum cmake version to 3.25 for cloak build

Browse Source
This commit is contained in:
Dmitriy Karpushin
2023-03-10 12:09:46 +03:00
parent 109512d83e
commit beca12ae40
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/build.gradle
+4
View File
@@ -12,6 +12,7 @@ buildscript {
threetenabpVersion = '1.1.1' threetenabpVersion = '1.1.1'
groupName = 'org.amnezia.vpn' groupName = 'org.amnezia.vpn'
minSdkVer = '24' minSdkVer = '24'
cmakeMinVersion = "3.25.0+"
} }
repositories { repositories {
@@ -150,6 +151,7 @@ android {
minifyEnabled false minifyEnabled false
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version cmakeMinVersion
arguments "-DANDROID_PACKAGE_NAME=${groupName}", arguments "-DANDROID_PACKAGE_NAME=${groupName}",
"-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}",
"-DANDROID_PLATFORM=${minSdkVer}" "-DANDROID_PLATFORM=${minSdkVer}"
@@ -162,6 +164,7 @@ android {
minifyEnabled false minifyEnabled false
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version cmakeMinVersion
arguments "-DANDROID_PACKAGE_NAME=${groupName}", arguments "-DANDROID_PACKAGE_NAME=${groupName}",
"-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}",
"-DANDROID_PLATFORM=${minSdkVer}" "-DANDROID_PLATFORM=${minSdkVer}"
@@ -178,6 +181,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version cmakeMinVersion
path "${projectDir}/cpp/CMakeLists.txt" path "${projectDir}/cpp/CMakeLists.txt"
} }
} }
client/android/cpp/cloak.cmake
+9 -4
View File
@@ -1,3 +1,5 @@
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(TARGET ck_ovpn_plugin_go) set(TARGET ck_ovpn_plugin_go)
set(CLOAK_SRCS cloak/cmd/ck-ovpn-plugin/ck-ovpn-plugin.go) set(CLOAK_SRCS cloak/cmd/ck-ovpn-plugin/ck-ovpn-plugin.go)
@@ -12,19 +14,22 @@ list(APPEND BUILD_CMD_ARGS -buildmode=c-shared -o ${CMAKE_CURRENT_BINARY_DIR}/${
set(PREPARE_ENV_ARGS env) set(PREPARE_ENV_ARGS env)
list(APPEND PREPARE_ENV_ARGS -w CGO_ENABLED=1 GOOS=android) list(APPEND PREPARE_ENV_ARGS -w CGO_ENABLED=1 GOOS=android)
string(REGEX MATCH ".+-([0-9]+)$" ANDROID_API_LEVEL ${ANDROID_PLATFORM})
set(ANDROID_API_LEVEL ${CMAKE_MATCH_1})
if ("${ANDROID_ABI}" STREQUAL "x86") if ("${ANDROID_ABI}" STREQUAL "x86")
list(APPEND PREPARE_ENV_ARGS GOARCH=386) list(APPEND PREPARE_ENV_ARGS GOARCH=386)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/i686-linux-android${ANDROID_PLATFORM}-clang) list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/i686-linux-android${ANDROID_API_LEVEL}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "x86_64") elseif ("${ANDROID_ABI}" STREQUAL "x86_64")
list(APPEND PREPARE_ENV_ARGS GOARCH=amd64) list(APPEND PREPARE_ENV_ARGS GOARCH=amd64)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/x86_64-linux-android${ANDROID_PLATFORM}-clang) list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/x86_64-linux-android${ANDROID_API_LEVEL}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "arm64-v8a") elseif ("${ANDROID_ABI}" STREQUAL "arm64-v8a")
list(APPEND PREPARE_ENV_ARGS GOARCH=arm64) list(APPEND PREPARE_ENV_ARGS GOARCH=arm64)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/aarch64-linux-android${ANDROID_PLATFORM}-clang) list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/aarch64-linux-android${ANDROID_API_LEVEL}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "armeabi-v7a") elseif ("${ANDROID_ABI}" STREQUAL "armeabi-v7a")
list(APPEND PREPARE_ENV_ARGS GOARCH=arm) list(APPEND PREPARE_ENV_ARGS GOARCH=arm)
list(APPEND PREPARE_ENV_ARGS GOARM=7) list(APPEND PREPARE_ENV_ARGS GOARM=7)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/armv7a-linux-androideabi${ANDROID_PLATFORM}-clang) list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/armv7a-linux-androideabi${ANDROID_API_LEVEL}-clang)
endif () endif ()
add_custom_command( add_custom_command(