mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-26 23:01:04 +08:00
Merge pull request #4431 from stephan57160/master
Problem: Android helpers no not validate dependent libraries.
This commit is contained in:
commit
a782d79d45
@ -320,8 +320,12 @@ function android_build_verify_so {
|
|||||||
ANDROID_BUILD_FAIL+=(" ${elfoutput}")
|
ANDROID_BUILD_FAIL+=(" ${elfoutput}")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for dep_soname do
|
for dep_soname in "$@" ; do
|
||||||
if [[ $elfoutput != *"library: [${dep_soname}]"* ]]; then
|
local dep_sofile="${ANDROID_BUILD_PREFIX}/lib/${dep_soname}"
|
||||||
|
if [ ! -f "${dep_sofile}" ]; then
|
||||||
|
ANDROID_BUILD_FAIL+=("Found no library named ${dep_soname}")
|
||||||
|
ANDROID_BUILD_FAIL+=(" ${dep_sofile}")
|
||||||
|
elif [[ $elfoutput != *"library: [${dep_soname}]"* ]]; then
|
||||||
ANDROID_BUILD_FAIL+=("Library ${soname} was expected to be linked to library with soname:")
|
ANDROID_BUILD_FAIL+=("Library ${soname} was expected to be linked to library with soname:")
|
||||||
ANDROID_BUILD_FAIL+=(" ${dep_soname}")
|
ANDROID_BUILD_FAIL+=(" ${dep_soname}")
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user