3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3724 from benjdero/qol-improvements

Browse Source 
Add a few quality of life improvements to the Android build scripts
This commit is contained in:
Luca Boccassi 2019-10-28 16:34:33 +00:00 committed by GitHub
commit a33f1101dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELICENSE/benjaminderoche.md → RELICENSE/benjdero.md
View File

@ -4,7 +4,7 @@ This is a statement by Benjamin Deroche
that grants permission to relicense its copyrights in the libzmq C++ that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2). library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
A portion of the commits made by the Github handle "BenjaminDeroche", with A portion of the commits made by the Github handle "benjdero", with
commit author "Benjamin Deroche", are copyright of Benjamin Deroche. commit author "Benjamin Deroche", are copyright of Benjamin Deroche.
This document hereby grants the libzmq project team to relicense libzmq, This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above. including all past, present and future contributions of the author listed above.

2
builds/android/android_build_helper.sh
View File

@ -248,7 +248,7 @@ function android_build_verify_so {
fi fi
android_build_check_fail android_build_check_fail
local elfoutput=$($readelf_bin -d ${sofile}) local elfoutput=$(LC_ALL=C $readelf_bin -d ${sofile})
local soname_regexp='soname: \[([[:alnum:]\.]+)\]' local soname_regexp='soname: \[([[:alnum:]\.]+)\]'
if [[ $elfoutput =~ $soname_regexp ]]; then if [[ $elfoutput =~ $soname_regexp ]]; then

6
builds/android/ci_build.sh
View File

@ -14,12 +14,14 @@ else
exit 1 exit 1
fi fi
if [ ! -d "/tmp/${NDK_VERSION}" ] ; then
export FILENAME=$NDK_VERSION-$HOST_PLATFORM.zip export FILENAME=$NDK_VERSION-$HOST_PLATFORM.zip
(cd '/tmp' \ (cd '/tmp' \
&& wget http://dl.google.com/android/repository/$FILENAME \ && wget http://dl.google.com/android/repository/$FILENAME -O $FILENAME \
&& unzip $FILENAME &> /dev/null ) || exit 1 && unzip -q $FILENAME) || exit 1
unset FILENAME unset FILENAME
fi
function _build_arch { function _build_arch {
export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}" export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"