summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/Android
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-07-12 12:29:08 (GMT)
committerBrad King <brad.king@kitware.com>2017-07-12 12:39:42 (GMT)
commite0fb3f314f0dcd2aa0ad2fd97fe3637f18747439 (patch)
treeff750db7ba7777ae7abdbc6104950260f54aa9d1 /Modules/Platform/Android
parent372de3f8039f69b3a2edcf7120083ec4097f8bd3 (diff)
downloadCMake-e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439.zip
CMake-e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439.tar.gz
CMake-e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439.tar.bz2
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).
Diffstat (limited to 'Modules/Platform/Android')
-rw-r--r--Modules/Platform/Android/ndk-stl-c++_shared.cmake1
1 files changed, 1 insertions, 0 deletions
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()