From: Uwe Hermann <redacted>
Date: Tue, 28 Jul 2015 17:53:57 +0000 (+0200)
Subject: sigrok-cross-android: Bump NDK to r10e, SDK to r24.3.3.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f3422e31846687ca1d02192dc9e238f0d4d40387;p=sigrok-util.git

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

Build-tested and tested on hardware (ARM tablet).
---

diff --git a/cross-compile/android/README b/cross-compile/android/README
index 66d0bb0..023b1c4 100644
--- a/cross-compile/android/README
+++ b/cross-compile/android/README
@@ -23,9 +23,9 @@ Requirements
  - pkg-config (>= 0.22)
  - gettext
  - ant
- - Android NDK (tested: r10d)
+ - Android NDK (tested: r10e)
    - Android cross-compile toolchain (tested: arm-linux-androideabi-4.9)
- - Android SDK (tested: r23.0.2)
+ - Android SDK (tested: r24.3.3)
  - On 64bit hosts, you also need some i386 packages. E.g. on Debian/Ubuntu:
      $ dpkg --add-architecture i386
      $ apt-get update
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 4aee372..86de9af 100755
--- 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,8 +76,8 @@ 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_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