mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Merge commit '82fea30fcce1d169de7ec42be84d079e0899519c' into feature/update-dependenies
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
# setup PATH for Android SDK and NDK
|
||||
AD=$HOME/src/android
|
||||
export SDK=$AD/android-sdk-macosx
|
||||
export NDK=$AD/android-ndk-r10d
|
||||
[ -z "$SDK" ] && export SDK=$DEP_DIR/android-sdk
|
||||
[ -z "$NDK" ] && export NDK=$SDK/ndk-bundle
|
||||
if [ "$NO_MOD_PATH" != "1" ]; then
|
||||
export PATH="$SDK/tools:$SDK/platform-tools:$PATH"
|
||||
fi
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android
|
||||
export ABI=armeabi
|
||||
export DEBUG_BUILD=0
|
||||
export OTHER_COMPILER_FLAGS=""
|
||||
export CXX_COMPILER_FLAGS="-std=c++11"
|
||||
export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O3"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm
|
||||
export PLATFORM_FLAGS="--sysroot=$TC/sysroot"
|
||||
export PLATFORM_FLAGS="-march=armv5te --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/arm-linux-androideabi-g++"
|
||||
export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-a7a
|
||||
export ABI=armeabi-v7a
|
||||
export DEBUG_BUILD=0
|
||||
export OTHER_COMPILER_FLAGS=""
|
||||
export CXX_COMPILER_FLAGS="-std=c++11"
|
||||
export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O3"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm
|
||||
export PLATFORM_FLAGS="-march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export PLATFORM_FLAGS="-D__LP32__ -D__ANDROID_API__=14 -march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/arm-linux-androideabi-g++"
|
||||
export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-a7a-dbg
|
||||
export ABI=armeabi-v7a
|
||||
export DEBUG_BUILD=1
|
||||
export OTHER_COMPILER_FLAGS="-g"
|
||||
export CXX_COMPILER_FLAGS="-std=c++11"
|
||||
export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O0"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm
|
||||
export PLATFORM_FLAGS="-march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/arm-linux-androideabi-g++"
|
||||
export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-a8a
|
||||
export ABI=arm64-v8a
|
||||
export DEBUG_BUILD=0
|
||||
@@ -7,7 +7,9 @@ export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O3"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm64
|
||||
export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export PLATFORM_FLAGS="-D__ANDROID_API__=21 -march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/aarch64-linux-android-g++"
|
||||
export GCC_CMD="$TC/bin/aarch64-linux-android-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-a8a-dbg
|
||||
export ABI=arm64-v8a
|
||||
export DEBUG_BUILD=1
|
||||
@@ -8,6 +8,8 @@ export LIB_OPT_LEVEL="-O0"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm64
|
||||
export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/aarch64-linux-android-g++"
|
||||
export GCC_CMD="$TC/bin/aarch64-linux-android-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
export DEP_DIR=$HOME/src/android
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-dbg
|
||||
export ABI=armeabi
|
||||
export DEBUG_BUILD=1
|
||||
export OTHER_COMPILER_FLAGS="-g"
|
||||
export CXX_COMPILER_FLAGS="-std=c++11"
|
||||
export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O0"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-arm
|
||||
export PLATFORM_FLAGS="--sysroot=$TC/sysroot"
|
||||
export PLATFORM_FLAGS="-march=armv5te --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/arm-linux-androideabi-g++"
|
||||
export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android
|
||||
export PLATFORM=android-x86
|
||||
export ABI=x86
|
||||
export DEBUG_BUILD=0
|
||||
export OTHER_COMPILER_FLAGS=""
|
||||
export CXX_COMPILER_FLAGS="-std=c++1y"
|
||||
export LIB_OPT_LEVEL="-O3"
|
||||
export LIB_FPIC="-fPIC"
|
||||
export TC=$DEP_DIR/tc-x86
|
||||
export PLATFORM_FLAGS="-D__LP32__ -D__ANDROID_API__=14 -march=i686 -fomit-frame-pointer --sysroot=$TC/sysroot"
|
||||
export GPP_CMD="$TC/bin/i686-linux-android-g++"
|
||||
export GCC_CMD="$TC/bin/i686-linux-android-gcc"
|
||||
|
||||
[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
|
||||
export PATH="$TC/bin:$TC/i686-linux-android/bin:$VARS_SAVE_PATH"
|
||||
Reference in New Issue
Block a user