Merge pull request #1243 from jemc/master

Problem: qt-android build doesn't fully work for downstream builds

.travis.yml

@@ -3,8 +3,8 @@
 language: c
 
 env:
-  - BUILD_TYPE=default
-  - BUILD_TYPE=qt-android
+- BUILD_TYPE=default
+- BUILD_TYPE=qt-android
 
 # Build and check this project according to the BUILD_TYPE
 script: ./ci_build.sh

builds/qt-android/android_build_helper.sh

@@ -60,7 +60,7 @@ ANDROID_BUILD_FAIL=()
 
 function android_build_check_fail {
     if [ ! ${#ANDROID_BUILD_FAIL[@]} -eq 0 ]; then
-        echo "qt-android build failed for the following reasons:"
+        echo "Android build failed for the following reasons:"
         for reason in "${ANDROID_BUILD_FAIL[@]}"; do
             local formatted_reason="  ${reason}"
             echo "${formatted_reason}"
@@ -248,7 +248,7 @@ function android_build_opts {
     local CFLAGS="--sysroot=${ANDROID_BUILD_SYSROOT} -I${ANDROID_BUILD_PREFIX}/include"
     local CPPFLAGS="--sysroot=${ANDROID_BUILD_SYSROOT} -I${ANDROID_BUILD_PREFIX}/include"
     local CXXFLAGS="--sysroot=${ANDROID_BUILD_SYSROOT} -I${ANDROID_BUILD_PREFIX}/include"
-    local LDFLAGS=""
+    local LDFLAGS="-L${ANDROID_BUILD_PREFIX}/lib"
     local LIBS="-lc -lgcc -ldl"
     
     _android_build_opts_process_binaries

builds/qt-android/build.sh

 #!/usr/bin/env bash
 
-# Get directory of current script
-ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Use directory of current script as the build directory and working directory
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+ANDROID_BUILD_DIR="$(pwd)"
 
 # Get access to android_build functions and variables
 source ${ANDROID_BUILD_DIR}/android_build_helper.sh
@@ -13,44 +14,43 @@ ANDROID_BUILD_CXXSTL="gnustl_shared_48"
 android_build_env
 android_build_opts
 
-# Clear a temporary build directory
+# Use a temporary build directory
 cache="/tmp/android_build/${TOOLCHAIN_NAME}"
-rm -rf "${cache}"
 mkdir -p "${cache}"
 
+##
+# Build libsodium from latest release tarball
 
-echo
-echo "Building qt-android libsodium from latest release tarball..."
-echo
+(android_build_verify_so "libsodium.so" &> /dev/null) || {
+    rm -rf "${cache}/libsodium"
+    (cd "${cache}" && mkdir libsodium \
+        && wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz\
+            -O "${cache}/libsodium.tar.gz" \
+        && tar -C libsodium -xf libsodium.tar.gz --strip=1) || exit 1
     
-wget "https://download.libsodium.org/libsodium/releases/LATEST.tar.gz" \
-    -O "${cache}/libsodium.tar.gz"
-
-(cd "${cache}" && mkdir libsodium \
-    && tar -C libsodium -xf libsodium.tar.gz --strip=1 \
-    && cd "libsodium" && ./autogen.sh \
+    (cd "${cache}/libsodium" && ./autogen.sh \
         && ./configure "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
         && make \
         && make install) || exit 1
+}
+
+##
+# Build libzmq from local source
 
-echo
-echo "Building qt-android libzmq from local source..."
-echo
+LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
 
-cp -r ../.. "${cache}/libzmq"
+(android_build_verify_so "libzmq.so" "libsodium.so" &> /dev/null) || {
+    rm -rf "${cache}/libzmq"
+    (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && make clean)
     
-(cd "${cache}/libzmq" && ./autogen.sh \
+    (cd "${cache}/libzmq" && ./autogen.sh \
         && ./configure "${ANDROID_BUILD_OPTS[@]}" --with-libsodium=yes \
         && make \
         && make install) || exit 1
+}
 
-echo
-echo "Verifying qt-android libsodium.so and libzmq.so libraries..."
-echo
+##
+# Verify shared libraries in prefix
 
 android_build_verify_so "libsodium.so"
 android_build_verify_so "libzmq.so" "libsodium.so"
-
-echo
-echo "Completed qt-android build!"
-echo