sigrok-cross-android: Bump NDK to r10e, SDK to r24.3.3.

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index caa374b7a0886e62131ecc19fbc1616b3adba0fb..86de9af67f56ef7b9abd44a56df528c07d9a62d4 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -26,7 +26,7 @@ set -e
 ANDROID_PATH=$HOME/android
 
 # The path where the Android NDK is located.
-ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e
 
 # The path where the Android SDK is located.
 ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
@@ -76,14 +76,14 @@ VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
 VER_BOOST=1.57.0
 VER_QT=5.4.1
-VER_NDK=10d
-VER_SDK=23.0.2
-VER_AND_BT=22.0.1 # android build tools version
-VER_AND_API=16    # target android API version
+VER_NDK=10e
+VER_SDK=24.3.3
+VER_AND_BT=22.0.1 # Android build tools version
+VER_AND_API=16    # Target Android API version
 
 SF_MIRROR=download.sourceforge.net
 
-WGET="wget --quiet"
+WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
 case "$TOOLCHAIN_TRIPLET" in
@@ -103,18 +103,24 @@ if [ "x$1" = "xprepare" ]; then
   # NDK
   $WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin
   chmod 700 android-ndk-r$VER_NDK-linux-x86.bin
-  ./android-ndk-r$VER_NDK-linux-x86.bin
+  ./android-ndk-r$VER_NDK-linux-x86.bin -y
   cd android-ndk-r$VER_NDK
-  ./build/tools/make-standalone-toolchain.sh --platform=android-16 \
+  ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
     --toolchain=arm-linux-androideabi-4.9 \
     --install-dir=$ANDROID_PATH/android-arm-toolchain
+  ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
+    --toolchain=x86-4.9 \
+    --install-dir=$ANDROID_PATH/android-i686-toolchain
+  ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
+    --toolchain=mipsel-linux-android-4.9 \
+    --install-dir=$ANDROID_PATH/android-mipsel-toolchain
   cd ..
 
   # SDK
   $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
   tar xfz android-sdk_r$VER_SDK-linux.tgz
   cd android-sdk-linux
-  ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
+  echo y | ./tools/android update sdk --no-ui --all --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
   cd ..
 
   exit