Skip to content

Commit

Permalink
build/targets.mk: use Android NDK r23b
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxKellermann committed Nov 2, 2021
1 parent c3997f5 commit 39910c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/targets.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ For Android, you need:

- `Android SDK level 26 <http://developer.android.com/sdk/>`__

- `Android NDK r23 <http://developer.android.com/sdk/ndk/>`__
- `Android NDK r23b <http://developer.android.com/sdk/ndk/>`__

- `Ogg Vorbis <http://www.vorbis.com/>`__

Expand All @@ -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::
Expand Down
2 changes: 1 addition & 1 deletion ide/provisioning/install-android-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 39910c0

Please sign in to comment.