github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-04-24 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '82fea30fcce1d169de7ec42be84d079e0899519c' into feature/update-dependenies

Browse Source
This commit is contained in:
Sergey Abramchuk
2018-01-08 11:44:56 +03:00
parent 9ce5e4c989 82fea30fcc
commit 31ceba3bd6
437 changed files with 7377 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter/Vendors/openvpn/scripts/android/build-all
+33 -4
View File
@@ -1,12 +1,36 @@
#!/usr/bin/env bash
# Build Android dependencies (run after build-toolchain)
# Build the entire core package as required by Android App
set -e
if [ -z "$O3" ]; then
echo O3 var must point to ovpn3 tree ; exit 1
echo O3 var must point to ovpn3 tree
exit 1
fi
export DEP_DIR=${DEP_DIR:-$HOME/src/android}
[ -z "$ECHO" ] && ECHO=0
if [ "$ECHO" -eq 0 ]; then
exec > $O3/android_build.log
exec 2>&1
fi
[ -z "$DEP_DIR" ] && export DEP_DIR=${O3}/deps
[ -z "$DL" ] && export DL=~/dl
mkdir -p $DEP_DIR
mkdir -p $DL
export NO_MOD_PATH=1
. $O3/core/vars/android-sdk-path
echo BUILD ANDROID SDK
$O3/core/scripts/android/build-sdk
echo BUILD TOOLCHAIN
$O3/core/scripts/android/build-toolchain
echo BUILD DEPS
cd $DEP_DIR
rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* snappy* mbedtls*
rm -rf asio* lz4* mbedtls* #lzo* boost* minicrypto openssl* polarssl* snappy*
echo "******* ASIO"
$O3/core/deps/asio/build-asio
echo "******* MBEDTLS"
@@ -24,3 +48,8 @@ $O3/core/scripts/android/build-lz4
#$O3/core/scripts/android/build-lzo
#echo "******* SNAPPY"
#$O3/core/scripts/android/build-snappy
echo BUILD CORE LIBRARY
$O3/core/javacli/build-android
echo DONE.
OpenVPN Adapter/Vendors/openvpn/scripts/android/build-lz4
+9 -6
View File
@@ -2,20 +2,23 @@
set -e
if [ -z "$O3" ]; then
echo O3 var must point to ovpn3 tree ; exit 1
fi
if [ -z "$DEP_DIR" ]; then
echo DEP_DIR var must point to ovpn3 dependency tree
echo O3 var must point to ovpn3 tree
exit 1
fi
if [ -z "$DEP_DIR" ]; then
echo DEP_DIR var must point to the dependency build directory
exit 1
fi
cd $DEP_DIR
. $O3/core/vars/android-sdk-path
cd $DEP_DIR
rm -rf lz4
mkdir lz4
for target in android-a8a android-a8a-dbg android-a7a android-a7a-dbg android android-dbg ; do
TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
for target in $TARGETS; do
echo '***************' TARGET $target
TARGET=$target $O3/core/deps/lz4/build-lz4
done
OpenVPN Adapter/Vendors/openvpn/scripts/android/build-mbedtls
+12 -7
View File
@@ -2,22 +2,27 @@
set -e
if [ -z "$O3" ]; then
echo O3 var must point to ovpn3 tree ; exit 1
fi
if [ -z "$DEP_DIR" ]; then
echo DEP_DIR var must point to ovpn3 dependency tree
echo O3 var must point to ovpn3 tree
exit 1
fi
if [ -z "$DEP_DIR" ]; then
echo DEP_DIR var must point to the dependency build directory
exit 1
fi
cd $DEP_DIR
. $O3/core/vars/android-sdk-path
cd $DEP_DIR
rm -rf mbedtls
mkdir -p mbedtls
# disable minicrypto for now
mini=0
rm -rf mbedtls
TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
for target in android-a8a android-a8a-dbg android-a7a android-a7a-dbg android android-dbg ; do
for target in $TARGETS; do
echo '***************' TARGET $target
VERBOSE=1 TARGET=$target CMAKE_TARGET=android USE_MINICRYPTO=$mini MINICRYPTO_DIR=$(pwd)/minicrypto/minicrypto-$target $O3/core/deps/mbedtls/build-mbedtls
[ "$ANDROID_DBG_ONLY" = "1" ] && exit
OpenVPN Adapter/Vendors/openvpn/scripts/android/build-sdk
Executable
+50
View File
@@ -0,0 +1,50 @@
#!/usr/bin/env bash
set -e
if [ -z "$O3" ]; then
echo O3 var must point to ovpn3 tree
exit 1
fi
if [ -z "$DEP_DIR" ]; then
echo DEP_DIR var must point to the dependency build directory
exit 1
fi
[ -z "$SDK" ] && export SDK=$DEP_DIR/android-sdk
if [ -d "$SDK" ]; then
echo "Android SDK already exists at $SDK. Doing only update"
yes | $SDK/tools/bin/sdkmanager --licenses
$SDK/tools/bin/sdkmanager --update
exit 0
fi
. $O3/core/deps/functions.sh
FNAME=sdk-tools-linux-3859397.zip
URL=https://dl.google.com/android/repository/${FNAME}
CSUM=444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0
download
cd $DEP_DIR
rm -rf android-sdk
mkdir android-sdk
. $O3/core/vars/android-sdk-path
cd $SDK
unzip $DL/$FNAME
yes | $SDK/tools/bin/sdkmanager --licenses
$SDK/tools/bin/sdkmanager --update
$SDK/tools/bin/sdkmanager 'build-tools;26.0.2' \
'ndk-bundle' \
'extras;android;m2repository' \
'patcher;v4' \
'platform-tools' \
'platforms;android-26' \
'tools'
exit 0
OpenVPN Adapter/Vendors/openvpn/scripts/android/build-toolchain
+27 -4
View File
@@ -13,10 +13,10 @@ cd $DEP_DIR
DEST=$(pwd)/tc-arm64
rm -rf $DEST
ABI=aarch64-linux-android
ABI_VER=4.9
$NDK/build/tools/make-standalone-toolchain.sh \
--verbose \
--ndk-dir=$NDK \
--toolchain=$ABI-4.9 \
--toolchain=$ABI-$ABI_VER \
--stl=gnustl \
--arch=arm64 \
--platform=android-21 \
@@ -25,19 +25,42 @@ cd $DEST/$ABI/bin
ln -s ../../bin/$ABI-gcc cc
ln -s ../../bin/$ABI-gcc gcc
ln -s ../../bin/$ABI-g++ g++
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1 cc1
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1plus cc1plus
# 32 bit
cd $DEP_DIR
DEST=$(pwd)/tc-arm
rm -rf $DEST
ABI=arm-linux-androideabi
ABI_VER=4.9
$NDK/build/tools/make-standalone-toolchain.sh \
--verbose \
--ndk-dir=$NDK \
--toolchain=$ABI-4.8 \
--toolchain=$ABI-$ABI_VER \
--stl=gnustl \
--arch=arm \
--platform=android-14 \
--install-dir=$DEST
cd $DEST/$ABI/bin
ln -s ../../bin/$ABI-gcc cc
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1 cc1
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1plus cc1plus
# 32 bit x86 for Android emulator
cd $DEP_DIR
DEST=$(pwd)/tc-x86
rm -rf $DEST
ABI=x86-linux-android
SUB=i686-linux-android
ABI_VER=4.9
$NDK/build/tools/make-standalone-toolchain.sh \
--verbose \
--toolchain=$ABI-$ABI_VER \
--stl=gnustl \
--arch=x86 \
--platform=android-14 \
--install-dir=$DEST
cd $DEST/$SUB/bin
ln -s ../../bin/$SUB-gcc cc
ln -s ../../libexec/gcc/$SUB/$ABI_VER.x/cc1 cc1
ln -s ../../libexec/gcc/$SUB/$ABI_VER.x/cc1plus cc1plus