From e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 12 Jul 2017 08:29:08 -0400 Subject: Android: Link to android_support with c++_shared The NDK has done this in `build/core/definitions.mk` since r13 (r12 and below do so only for c++_static). --- Modules/Platform/Android/ndk-stl-c++_shared.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/Platform/Android/ndk-stl-c++_shared.cmake b/Modules/Platform/Android/ndk-stl-c++_shared.cmake index f585adb..3389408 100644 --- a/Modules/Platform/Android/ndk-stl-c++_shared.cmake +++ b/Modules/Platform/Android/ndk-stl-c++_shared.cmake @@ -1,4 +1,5 @@ include(Platform/Android/ndk-stl-c++) macro(__android_stl lang) __android_stl_cxx(${lang} libc++_shared.so) + __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libandroid_support.a" 0) endmacro() -- cgit v0.12