From 01e65c4555d890ddad179a3d26b7acf99327d7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 30 Jul 2019 14:58:11 +0200 Subject: [PATCH] Android: Fix support for android_stl=no with NDK r20 Fixes #30688. --- platform/android/detect.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/android/detect.py b/platform/android/detect.py index 5f4a4763def..b62b8e443ac 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -259,6 +259,9 @@ def configure(env): env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libandroid_support.a"]) env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/"]) env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libc++_shared.so"]) + else: + # This is the legacy and minimal 'System STL' with support for basic features like new and delete + env.Append(LINKFLAGS=['-stdlib=libstdc++']) else: if mt_link: env.Append(LINKFLAGS=['-Wl,--threads'])