From 31c8ecfd6d534ac5f9a6d78d5dc31b85dccf930f Mon Sep 17 00:00:00 2001
From: Stephan Guilloux <stephan.guilloux@crisalid.com>
Date: Fri, 6 Jun 2025 10:58:45 +0200
Subject: [PATCH] ANDROID: Support NDK r27x.

This fix has to be reported in LIBZMQ as well and will fix https://github.com/zeromq/libzmq/issues/4744.
---
 zproject_android.gsl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zproject_android.gsl b/zproject_android.gsl
index c3bebf7b..964818fa 100644
--- a/zproject_android.gsl
+++ b/zproject_android.gsl
@@ -710,8 +710,11 @@ function android_build_opts {
 
     _android_build_opts_process_binaries
 
-    # Since NDK r23 we don't need -lgcc due to LLVM being now the default
-    if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
+    if [ ${NDK_NUMBER} -ge 2700 ] ; then
+        # Since NDK r27 symbols like '__aeabi_xxx' are no more exported in the dynamic lib.
+        export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -static-libstdc++"
+    elif [ ${NDK_NUMBER} -ge 2300 ] ; then
+        # Since NDK r23 we don't need -lgcc due to LLVM being now the default.
         export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -lc++_shared"
     else
         export ANDROID_BUILD_LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"