Merge pull request #4431 from stephan57160/master

Problem: Android helpers no not validate dependent libraries.
This commit is contained in:
Luca Boccassi 2022-10-01 11:56:10 +01:00 committed by GitHub
commit a782d79d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -320,8 +320,12 @@ function android_build_verify_so {
ANDROID_BUILD_FAIL+=(" ${elfoutput}")
fi
for dep_soname do
if [[ $elfoutput != *"library: [${dep_soname}]"* ]]; then
for dep_soname in "$@" ; do
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+=(" ${dep_soname}")
fi