From 39910c0214424b7d3b5ef6b991ab996f3ef136f6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Nov 2021 09:18:01 +0100 Subject: [PATCH] build/targets.mk: use Android NDK r23b --- build/targets.mk | 2 +- doc/build.rst | 4 ++-- ide/provisioning/install-android-tools.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/targets.mk b/build/targets.mk index 03aba83f0ea..550adb76d2e 100644 --- a/build/targets.mk +++ b/build/targets.mk @@ -327,7 +327,7 @@ ifeq ($(TARGET),UNIX) endif ifeq ($(TARGET),ANDROID) - ANDROID_NDK ?= $(HOME)/opt/android-ndk-r23 + ANDROID_NDK ?= $(HOME)/opt/android-ndk-r23b ANDROID_SDK_PLATFORM = android-29 ANDROID_NDK_API = 21 diff --git a/doc/build.rst b/doc/build.rst index bbb2cc82f55..4e72af95a6f 100644 --- a/doc/build.rst +++ b/doc/build.rst @@ -163,7 +163,7 @@ For Android, you need: - `Android SDK level 26 `__ -- `Android NDK r23 `__ +- `Android NDK r23b `__ - `Ogg Vorbis `__ @@ -186,7 +186,7 @@ tools/bin/sdkmanager  "build-tools;28.0.3"  "platforms;android-26" The ``Makefile`` assumes that the Android SDK is installed in ``~/opt/android-sdk-linux`` and the NDK is installed in -``~/opt/android-ndk-r23``. You can use the options ``ANDROID_SDK`` and +``~/opt/android-ndk-r23b``. You can use the options ``ANDROID_SDK`` and ``ANDROID_NDK`` to override these paths. Load/update the IOIO source code:: diff --git a/ide/provisioning/install-android-tools.sh b/ide/provisioning/install-android-tools.sh index 8a47bf40a20..72dac36b688 100755 --- a/ide/provisioning/install-android-tools.sh +++ b/ide/provisioning/install-android-tools.sh @@ -6,7 +6,7 @@ set -e ANDROID_SDK_TOOLS_VERSION=6858069_latest ANDROID_BUILD_TOOLS_VERSION=29.0.3 ANDROID_PLATFORM_VERSION=29 -ANDROID_NDK_VERSION=r23 +ANDROID_NDK_VERSION=r23b ANDROID_REPO_URL=https://dl.google.com/android/repository ANDROID_SDK_DIR=~/opt/android-sdk-linux ANDROID_NDK_DIR=~/opt/android-ndk-${ANDROID_NDK_VERSION}