From: Uwe Hermann Date: Sun, 18 Jan 2015 16:11:12 +0000 (+0100) Subject: sigrok-cross-android: Bump Android NDK to r10d. X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=47708ed7bfc51347fa31d59de56e4af7f99f908f;hp=f6b4e626978b0a87d316c7d4e1a4c94fac4aa6ce sigrok-cross-android: Bump Android NDK to r10d. --- diff --git a/cross-compile/android/README b/cross-compile/android/README index ac8288c..66d0bb0 100644 --- a/cross-compile/android/README +++ b/cross-compile/android/README @@ -23,7 +23,7 @@ Requirements - pkg-config (>= 0.22) - gettext - ant - - Android NDK (tested: r10c) + - Android NDK (tested: r10d) - Android cross-compile toolchain (tested: arm-linux-androideabi-4.9) - Android SDK (tested: r23.0.2) - On 64bit hosts, you also need some i386 packages. E.g. on Debian/Ubuntu: diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 20eeb76..223363e 100755 --- 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 @@ -72,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