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

OpenVPN Adapter/Vendors/openvpn/scripts/android/build-toolchain

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