Skip to content

Commit c2f7f8a

Browse files
stephan57160bluca
authored andcommitted
ANDROID: Support NDK r27x.
This fix has to be reported in LIBZMQ as well and will fix #4744.
1 parent 34f7fa2 commit c2f7f8a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

builds/android/android_build_helper.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,11 @@ function android_build_opts {
355355

356356
_android_build_opts_process_binaries
357357

358-
# Since NDK r23 we don't need -lgcc due to LLVM being now the default
359-
if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
358+
if [ ${NDK_NUMBER} -ge 2700 ] ; then
359+
# Since NDK r27 symbols like '__aeabi_xxx' are no more exported in the dynamic lib.
360+
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -static-libstdc++"
361+
elif [ ${NDK_NUMBER} -ge 2300 ] ; then
362+
# Since NDK r23 we don't need -lgcc due to LLVM being now the default.
360363
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -lc++_shared"
361364
else
362365
export ANDROID_BUILD_LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"

0 commit comments

Comments
 (0)