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

Android pt refactor (#176)

Browse Source 
Cloak build fix
This commit is contained in:
pokamest
2023-02-17 01:34:08 +00:00
committed by GitHub
parent adc07a2b6a
commit 3f600c0088
3 changed files with 41 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/build.gradle
+8 -3
View File
@@ -11,6 +11,7 @@ buildscript {
streamsupportVersion = '1.7.0'
threetenabpVersion = '1.1.1'
groupName = 'org.amnezia.vpn'
minSdkVer = '24'
}
repositories {
@@ -121,7 +122,7 @@ android {
defaultConfig {
resConfig "en"
minSdkVersion = 24
minSdkVersion = minSdkVer
targetSdkVersion = 30
versionCode 10 // Change to a higher number
versionName "2.0.10" // Change to a higher number
@@ -137,7 +138,9 @@ android {
minifyEnabled false
externalNativeBuild {
cmake {
arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
arguments "-DANDROID_PACKAGE_NAME=${groupName}",
"-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}",
"-DANDROID_PLATFORM=${minSdkVer}"
}
}
}
@@ -147,7 +150,9 @@ android {
minifyEnabled false
externalNativeBuild {
cmake {
arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
arguments "-DANDROID_PACKAGE_NAME=${groupName}",
"-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}",
"-DANDROID_PLATFORM=${minSdkVer}"
}
}
}
client/android/cpp/cloak.cmake
+33 -36
View File
@@ -3,45 +3,42 @@ set(TARGET ck_ovpn_plugin_go)
set(CLOAK_SRCS cloak/cmd/ck-ovpn-plugin/ck-ovpn-plugin.go)
set(CLOAK_LIB ck-ovpn-plugin.so)
if ("${ANDROID_ABI}" STREQUAL "x86")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
DEPENDS ${CLOAK_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cloak/cmd/ck-ovpn-plugin
COMMAND env GOPATH=$ENV{GOPATH} CGO_ENABLED=1 CC=$ENV{ANDROID_X86_CC} GOOS=android GOARCH=386 go build -buildmode=c-shared
-o "${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}"
${CMAKE_GO_FLAGS} ./...
COMMENT "Building Go library")
elseif ("${ANDROID_ABI}" STREQUAL "x86_64")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
DEPENDS ${CLOAK_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cloak/cmd/ck-ovpn-plugin
COMMAND env GOPATH=$ENV{GOPATH} CGO_ENABLED=1 CC=$ENV{ANDROID_X86_64_CC} GOOS=android GOARCH=amd64 go build -buildmode=c-shared
-o "${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}"
${CMAKE_GO_FLAGS} ./...
COMMENT "Building Go library")
elseif ("${ANDROID_ABI}" STREQUAL "arm64-v8a")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
DEPENDS ${CLOAK_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cloak/cmd/ck-ovpn-plugin
COMMAND env GOPATH=$ENV{GOPATH} CGO_ENABLED=1 CC=$ENV{ANDROID_ARM64_CC} GOOS=android GOARCH=arm64 go build -buildmode=c-shared
-o "${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}"
${CMAKE_GO_FLAGS} ./...
COMMENT "Building Go library")
elseif ("${ANDROID_ABI}" STREQUAL "armeabi-v7a")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
DEPENDS ${CLOAK_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cloak/cmd/ck-ovpn-plugin
COMMAND env GOPATH=$ENV{GOPATH} CGO_ENABLED=1 CC=$ENV{ANDROID_ARM_CC} GOOS=android GOARCH=arm GOARM=7 go build -buildmode=c-shared
-o "${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}"
${CMAKE_GO_FLAGS} ./...
COMMENT "Building Go library")
endif ()
list(APPEND CMAKE_PROGRAM_PATH "/usr/local/go/bin")
find_program(GO_EXEC go)
set(BUILD_CMD_ARGS build)
list(APPEND BUILD_CMD_ARGS -buildmode=c-shared -o ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB} ${CMAKE_GO_FLAGS} ./...)
set(PREPARE_ENV_ARGS env)
list(APPEND PREPARE_ENV_ARGS -w CGO_ENABLED=1 GOOS=android)
if ("${ANDROID_ABI}" STREQUAL "x86")
list(APPEND PREPARE_ENV_ARGS GOARCH=386)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/i686-linux-android${ANDROID_PLATFORM}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "x86_64")
list(APPEND PREPARE_ENV_ARGS GOARCH=amd64)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/x86_64-linux-android${ANDROID_PLATFORM}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "arm64-v8a")
list(APPEND PREPARE_ENV_ARGS GOARCH=arm64)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/aarch64-linux-android${ANDROID_PLATFORM}-clang)
elseif ("${ANDROID_ABI}" STREQUAL "armeabi-v7a")
list(APPEND PREPARE_ENV_ARGS GOARCH=arm)
list(APPEND PREPARE_ENV_ARGS GOARM=7)
list(APPEND PREPARE_ENV_ARGS CC=${ANDROID_TOOLCHAIN_ROOT}/bin/armv7a-linux-androideabi${ANDROID_PLATFORM}-clang)
endif ()
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
DEPENDS ${CLOAK_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cloak/cmd/ck-ovpn-plugin
COMMAND ${GO_EXEC} ${PREPARE_ENV_ARGS}
COMMAND ${GO_EXEC} ${BUILD_CMD_ARGS}
COMMENT "Building Go library")
add_custom_target(${TARGET} DEPENDS ${CLOAK_LIB} ${HEADER})
add_library(ck-ovpn-plugin STATIC IMPORTED GLOBAL)
add_dependencies(ck-ovpn-plugin ${TARGET})
set_target_properties(ck-ovpn-plugin
PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB}
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})