Skip to content

Commit 5d35e02

Browse files
stephan57160bluca
authored andcommitted
ANDROID: Support NDK r27x (regen from ZProject).
1 parent 53b46d6 commit 5d35e02

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
@@ -328,8 +328,11 @@ function android_build_opts {
328328

329329
_android_build_opts_process_binaries
330330

331-
# Since NDK r23 we don't need -lgcc due to LLVM being now the default
332-
if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
331+
if [ ${NDK_NUMBER} -ge 2700 ] ; then
332+
# Since NDK r27 symbols like '__aeabi_xxx' are no more exported in the dynamic lib.
333+
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -static-libstdc++"
334+
elif [ ${NDK_NUMBER} -ge 2300 ] ; then
335+
# Since NDK r23 we don't need -lgcc due to LLVM being now the default.
333336
export ANDROID_BUILD_LIBS="-lc -ldl -lm -llog -lc++_shared"
334337
else
335338
export ANDROID_BUILD_LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"

0 commit comments

Comments
 (0)