generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Problem: Android dependencies are downloaded in an hard-coded /tmp/tmp-deps.

Browse Source 
Solution: Added variable ANDROID_DEPENDENCIES_DIR, and initialize to
/tmp/tmp-deps, to avoid clash with existing code.
This commit is contained in:
Guilloux Stephan (Ubuntu) 2022-11-18 17:49:00 +01:00 committed by Stephan Guilloux (cos)
parent 91bc18ee16
commit 30e950abfd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builds/android/android_build_helper.sh
View File

@ -460,7 +460,7 @@ function android_show_configure_opts {
# If ${PROJECT_ROOT}/../xxx exists # If ${PROJECT_ROOT}/../xxx exists
# set XXX_ROOT with it. # set XXX_ROOT with it.
# Else # Else
# set XXX_ROOT with /tmp/tmp-deps/xxx. # set XXX_ROOT with ${ANDROID_DEPENDENCIES_DIR}/xxx.
# Else # Else
# Verify that folder XXX_ROOT exists. # Verify that folder XXX_ROOT exists.
function android_init_dependency_root { function android_init_dependency_root {
@ -484,7 +484,7 @@ function android_init_dependency_root {
if [ -d "${PROJECT_ROOT}/../${lib_name}" ] ; then if [ -d "${PROJECT_ROOT}/../${lib_name}" ] ; then
eval "export ${variable_name}=\"$(cd "${PROJECT_ROOT}/../${lib_name}" && pwd)\"" eval "export ${variable_name}=\"$(cd "${PROJECT_ROOT}/../${lib_name}" && pwd)\""
else else
eval "export ${variable_name}=\"/tmp/tmp-deps/${lib_name}\"" eval "export ${variable_name}=\"${ANDROID_DEPENDENCIES_DIR}/${lib_name}\""
fi fi
variable_value="$(eval echo "\${${variable_name}}")" variable_value="$(eval echo "\${${variable_name}}")"
elif [ ! -d "${variable_value}" ] ; then elif [ ! -d "${variable_value}" ] ; then
@ -592,6 +592,9 @@ if [ -z "$ANDROID_BUILD_DIR" ]; then
ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
fi fi
# Where to download our dependencies
export ANDROID_DEPENDENCIES_DIR="${ANDROID_DEPENDENCIES_DIR:-/tmp/tmp-deps}"
# Set up a variable to hold the global failure reasons, separated by newlines # Set up a variable to hold the global failure reasons, separated by newlines
# (Empty string indicates no failure) # (Empty string indicates no failure)
ANDROID_BUILD_FAIL=() ANDROID_BUILD_FAIL=()