Merge pull request #4009 from benjdero/master

Problem: libzmq use outdated Android NDK version
This commit is contained in:
Luca Boccassi 2020-08-14 16:57:23 +01:00 committed by GitHub
commit 87ee106438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -5,12 +5,12 @@
You need the Android Native Development Kit (NDK) installed. See
[here](https://developer.android.com/ndk) to download it.
This project is tested against Android NDK version r20.
This project is tested against Android NDK version r21d.
If you installed version r20 all you have to do is to expose the NDK root
If you installed version r21d all you have to do is to expose the NDK root
directory as environment variable, e.g:
export ANDROID_NDK_ROOT=$HOME/android-ndk-r20
export ANDROID_NDK_ROOT=$HOME/android-ndk-r21d
If you installed another version you have to expose the NDK root directory as
well as the NDK version, e.g:

View File

@ -35,8 +35,8 @@ esac
# Set default values used in ci builds
export NDK_VERSION=${NDK_VERSION:-android-ndk-r20}
# With NDK r20, the minimum SDK version range is [16, 29].
export NDK_VERSION=${NDK_VERSION:-android-ndk-r21d}
# With NDK r21d, the minimum SDK version range is [16, 29].
# SDK version 21 is the minimum version for 64-bit builds.
export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
export NDK_VERSION=android-ndk-r20
export NDK_VERSION=android-ndk-r21d
export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
case $(uname | tr '[:upper:]' '[:lower:]') in