3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4429 from benjdero/master

Browse Source 
Problem: Default Android NDK version is not aligned with zproject
This commit is contained in:
Luca Boccassi 2022-09-26 14:15:03 +01:00 committed by GitHub
commit c73447b9e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/android/README.md
View File

@ -5,12 +5,12 @@
You need the Android Native Development Kit (NDK) installed. See You need the Android Native Development Kit (NDK) installed. See
[here](https://developer.android.com/ndk) to download it. [here](https://developer.android.com/ndk) to download it.
This project is tested against Android NDK version r24. This project is tested against Android NDK version r25.
If you installed version r24 all you have to do is to expose the NDK root If you installed version r25 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-r24 export ANDROID_NDK_ROOT=$HOME/android-ndk-r25
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/android_build_helper.sh
View File

@ -112,12 +112,12 @@ function android_build_env {
if [ -z "$ANDROID_NDK_ROOT" ]; then if [ -z "$ANDROID_NDK_ROOT" ]; then
ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable") ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r24\")") ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r25\")")
fi fi
if [ -z "$TOOLCHAIN_PATH" ]; then if [ -z "$TOOLCHAIN_PATH" ]; then
ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable") ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r24/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")") ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r25/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
fi fi
if [ -z "$TOOLCHAIN_HOST" ]; then if [ -z "$TOOLCHAIN_HOST" ]; then

2
builds/android/build.sh
View File

@ -34,7 +34,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
esac esac
# Set default values used in ci builds # Set default values used in ci builds
export NDK_VERSION=${NDK_VERSION:-android-ndk-r24} export NDK_VERSION=${NDK_VERSION:-android-ndk-r25}
# With NDK r22b, the minimum SDK version range is [16, 31]. # With NDK r22b, the minimum SDK version range is [16, 31].
# Since NDK r24, the minimum SDK version range is [19, 31]. # Since NDK r24, the minimum SDK version range is [19, 31].
# SDK version 21 is the minimum version for 64-bit builds. # SDK version 21 is the minimum version for 64-bit builds.

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-r24 export NDK_VERSION=android-ndk-r25
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