sigrok-cross-android: Bump Android NDK to r10d.

[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 63f66028a39ac84cd20bc3d090c3d2d48216fac7..223363eab385e0d1cd1b8ff098c63ecbccdc1a72 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -25,7 +25,7 @@ set -e
 ANDROID_PATH=$HOME/android
 
 # The path where the Android NDK is located.
-ANDROID_NDK=$ANDROID_PATH/android-ndk-r10c
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d
 
 # The path where the Android SDK is located.
 ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
@@ -34,6 +34,9 @@ ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
 TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain
 # TOOLCHAIN=$ANDROID_PATH/android-mipsel-toolchain
 # TOOLCHAIN=$ANDROID_PATH/android-i686-toolchain
+# TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86
+# TOOLCHAIN=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86
+# TOOLCHAIN=$ANDROID_NDK/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86
 
 # Select which Android toolchain to use.
 # Don't forget to also adapt TOOLCHAIN above if you change TOOLCHAIN_TRIPLET!
@@ -69,7 +72,7 @@ VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
 VER_BOOST=1.55.0
 VER_QT=5.3.1
-VER_NDK=10c
+VER_NDK=10d
 VER_SDK=23.0.2
 
 SF_MIRROR=switch.dl.sourceforge.net
@@ -105,7 +108,7 @@ if [ "x$1" = "xprepare" ]; then
   $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-21.1.0,android-8,android-10,android-11,android-14,android-16
+  ./tools/android update sdk --no-ui --filter platform-tools,build-tools-21.1.2,android-8,android-10,android-11,android-14,android-16
   cd ..
 
   exit
@@ -407,7 +410,7 @@ $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.t
 tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
 patch -p1 < ../../boost.patch
-CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system --without-icu
+CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
 echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" <linkflags>\"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam
 ./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL
 cd ..