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 #4433 from stephan57160/master

Browse Source 
Problem: Android build script may fail silently
This commit is contained in:
Luca Boccassi 2022-10-02 10:21:53 +01:00 committed by GitHub
commit 875c2b15c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/android/build.sh
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
function usage { function usage {
echo "Usage ./build.sh [ arm | arm64 | x86 | x86_64 ]" echo "Usage ./build.sh [ arm | arm64 | x86 | x86_64 ]"
} }
@ -86,7 +88,7 @@ LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
(android_build_verify_so ${VERIFY} &> /dev/null) || { (android_build_verify_so ${VERIFY} &> /dev/null) || {
rm -rf "${cache}/libzmq" rm -rf "${cache}/libzmq"
(cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && make clean) (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : ))
(cd "${cache}/libzmq" && ./autogen.sh \ (cd "${cache}/libzmq" && ./autogen.sh \
&& ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \ && ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \

7
builds/android/ci_build.sh
View File

@ -1,8 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
# Exit if any step fails
set -e
export NDK_VERSION=android-ndk-r25 export NDK_VERSION=android-ndk-r25
export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}" export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
# Cleanup.
rm -rf /tmp/tmp-deps
mkdir -p /tmp/tmp-deps
case $(uname | tr '[:upper:]' '[:lower:]') in case $(uname | tr '[:upper:]' '[:lower:]') in
linux*) linux*)
HOST_PLATFORM=linux HOST_PLATFORM=linux