[OVPN3-129] android: improve build system in order to perform full build

the scripts/android/build-all script is now in charge of
performing all the steps required to build a full android core.

Signed-off-by: Antonio Quartulli <[email protected]>

Author: ordex

javacli/build-android

@@ -31,7 +31,9 @@ fi
 echo SWIG
 swig -c++ -java -package $pkg -I$O3/core/client -I$O3/core ovpncli.i
 
-for TARGET in android-a7a android-a8a android-x86; do
+TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
+
+for TARGET in $TARGETS; do
 
 if [ "$DEBUG_BUILD" = "1" ]; then
     . ../vars/vars-${TARGET}-dbg
@@ -63,6 +65,7 @@ echo CORE $ABI
 $GPP_CMD \
     $CXX_COMPILER_FLAGS \
     $PLATFORM_FLAGS \
+    $OTHER_COMPILER_FLAGS \
     $LIB_OPT_LEVEL $LIB_FPIC \
     -Wall -Wno-sign-compare -Wno-unused-parameter \
     -Wno-unused-local-typedefs \
@@ -85,6 +88,7 @@ echo WRAP $ABI
 $GPP_CMD \
     $CXX_COMPILER_FLAGS \
     $PLATFORM_FLAGS \
+    $OTHER_COMPILER_FLAGS \
     $opt2 $LIB_FPIC \
     -fno-strict-aliasing \
     -Wall \

scripts/android/build-all

@@ -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.

scripts/android/build-lz4

@@ -2,23 +2,23 @@
 
 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
 if [ -z "$DEP_DIR" ]; then
-    echo DEP_DIR var must point to ovpn3 dependency tree
+    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 \
-        android-x86 ; 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

scripts/android/build-mbedtls

@@ -2,25 +2,27 @@
 
 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
+
 if [ -z "$DEP_DIR" ]; then
-    echo DEP_DIR var must point to ovpn3 dependency tree
+    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 \
-        android-x86; 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

scripts/android/build-sdk

@@ -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

vars/android-sdk-path

@@ -1,6 +1,5 @@
 # setup PATH for Android SDK and NDK
-AD=$HOME/src/android
-[ -z "$SDK" ] && export SDK=$AD/android-sdk-macosx
+[ -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"