Skip to content

Commit 6b46687

Browse files
stephan57160bluca
authored andcommitted
ANDROID: Support NDK r27x.
This fix has to be reported in LIBZMQ as well and will fix zeromq/libzmq#4744.
1 parent 5b9a162 commit 6b46687

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

zproject_android.gsl

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

711711
_android_build_opts_process_binaries
712712

713-
# Since NDK r23 we don't need -lgcc due to LLVM being now the default
714-
if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
713+
if [ ${NDK_NUMBER} -ge 2700 ] ; then
714+
# Since NDK r27 symbols like '__aeabi_xxx' are no more exported in the dynamic lib.
715+
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -static-libstdc++"
716+
elif [ ${NDK_NUMBER} -ge 2300 ] ; then
717+
# Since NDK r23 we don't need -lgcc due to LLVM being now the default.
715718
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -lc++_shared"
716719
else
717720
export ANDROID_BUILD_LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"

0 commit comments

Comments
 (0)