andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +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})
deploy/build_android.sh
-89
View File
@@ -31,95 +31,6 @@ echo "Using Qt in $QT_BIN_DIR"
echo "Using Android SDK in $ANDROID_SDK_ROOT"
echo "Using Android NDK in $ANDROID_NDK_ROOT"
function getHostTag() {
# Copyright (C) 2010 The Android Open Source Project
# Modified by Andy Wang (cbeuw.andy@gmail.com)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Detect host operating system and architecture
# The 64-bit / 32-bit distinction gets tricky on Linux and Darwin because
# uname -m returns the kernel's bit size, and it's possible to run with
# a 64-bit kernel and a 32-bit userland.
#
HOST_OS=$(uname -s)
case $HOST_OS in
Darwin) HOST_OS=darwin ;;
Linux) HOST_OS=linux ;;
FreeBsd) HOST_OS=freebsd ;;
CYGWIN* | *_NT-*) HOST_OS=windows ;;
*)
echo "ERROR: Unknown host operating system: $HOST_OS"
exit 1
;;
esac
echo "HOST_OS=$HOST_OS"
HOST_ARCH=$(uname -m)
case $HOST_ARCH in
i?86) HOST_ARCH=x86 ;;
x86_64 | amd64) HOST_ARCH=x86_64 ;;
*)
echo "ERROR: Unknown host CPU architecture: $HOST_ARCH"
exit 1
;;
esac
echo "HOST_ARCH=$HOST_ARCH"
# Detect 32-bit userland on 64-bit kernels
HOST_TAG="$HOST_OS-$HOST_ARCH"
case $HOST_TAG in
linux-x86_64 | darwin-x86_64)
# we look for x86_64 or x86-64 in the output of 'file' for our shell
# the -L flag is used to dereference symlinks, just in case.
file -L "$SHELL" | grep -q "x86[_-]64"
if [ $? != 0 ]; then
HOST_ARCH=x86
HOST_TAG=$HOST_OS-x86
echo "HOST_ARCH=$HOST_ARCH (32-bit userland detected)"
fi
;;
esac
# Check that we have 64-bit binaries on 64-bit system, otherwise fallback
# on 32-bit ones. This gives us more freedom in packaging the NDK.
if [ $HOST_ARCH = x86_64 -a ! -d $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$HOST_TAG ]; then
HOST_TAG=$HOST_OS-x86
if [ $HOST_TAG = windows-x86 ]; then
HOST_TAG=windows
fi
echo "HOST_TAG=$HOST_TAG (no 64-bit prebuilt binaries detected)"
else
echo "HOST_TAG=$HOST_TAG"
fi
}
#Copyright (C) 2017 by Max Lv <max.c.lv@gmail.com>
#Copyright (C) 2017 by Mygod Studio <contact-shadowsocks-android@mygod.be>
#This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.
function try() {
"$@" || exit -1
}
while [ ! -d "$ANDROID_NDK_HOME" ]; do
echo "Path to ndk-bundle not found"
exit -1
done
getHostTag
MIN_API=21
export ANDROID_PREBUILT_TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$HOST_TAG
export ANDROID_ARM_CC=$ANDROID_PREBUILT_TOOLCHAIN/bin/armv7a-linux-androideabi${MIN_API}-clang
export ANDROID_ARM64_CC=$ANDROID_PREBUILT_TOOLCHAIN/bin/aarch64-linux-android${MIN_API}-clang
export ANDROID_X86_CC=$ANDROID_PREBUILT_TOOLCHAIN/bin/i686-linux-android${MIN_API}-clang
export ANDROID_X86_64_CC=$ANDROID_PREBUILT_TOOLCHAIN/bin/x86_64-linux-android${MIN_API}-clang
# Build App
echo "Building App..."
cd $BUILD_DIR