generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 02:42:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4207 from benjdero/master

Browse Source 
Problem: Outdated Android build tools
This commit is contained in:
Luca Boccassi 2021-06-07 11:19:49 +01:00 committed by GitHub
commit b40a793142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/android/README.md
View File

@ -7,10 +7,10 @@ You need the Android Native Development Kit (NDK) installed. See
This project is tested against Android NDK version r21d. This project is tested against Android NDK version r21d.
If you installed version r21d all you have to do is to expose the NDK root If you installed version r21e all you have to do is to expose the NDK root
directory as environment variable, e.g: directory as environment variable, e.g:
export ANDROID_NDK_ROOT=$HOME/android-ndk-r21d export ANDROID_NDK_ROOT=$HOME/android-ndk-r21e
If you installed another version you have to expose the NDK root directory as If you installed another version you have to expose the NDK root directory as
well as the NDK version, e.g: well as the NDK version, e.g:

4
builds/android/build.sh
View File

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

2
builds/android/ci_build.sh
View File

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