Merge pull request #3724 from benjdero/qol-improvements

Add a few quality of life improvements to the Android build scripts

RELICENSE/benjaminderoche.md → RELICENSE/benjdero.md

@@ -4,7 +4,7 @@ This is a statement by Benjamin Deroche
 that grants permission to relicense its copyrights in the libzmq C++
 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.
 This document hereby grants the libzmq project team to relicense libzmq, 
 including all past, present and future contributions of the author listed above.

builds/android/android_build_helper.sh

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

builds/android/ci_build.sh

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