|
|
@ -1048,8 +1048,7 @@ if( BUILD_WITH_ANDROID_NDK ) |
|
|
|
set( ANDROID_RTTI ON ) |
|
|
|
set( ANDROID_RTTI ON ) |
|
|
|
set( __libstl "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++" ) |
|
|
|
set( __libstl "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++" ) |
|
|
|
set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) |
|
|
|
set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) |
|
|
|
set( __libgnustl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) |
|
|
|
set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/android/support/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" ) |
|
|
|
set( ANDROID_STL_INCLUDE_DIRS "${__libgnustl}/include" "${__libgnustl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libgnustl}/include/backward" ) |
|
|
|
|
|
|
|
else() |
|
|
|
else() |
|
|
|
message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) |
|
|
|
message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|