diff options
| author | Volker Krause <vkrause@kde.org> | 2019-02-14 18:29:43 +0100 |
|---|---|---|
| committer | Volker Krause <vkrause@kde.org> | 2019-02-15 14:05:21 +0100 |
| commit | 81374904954b8f68616b5b804a322a04016f7259 (patch) | |
| tree | 732ca0d553ece85776e9b97c8b4c1b53848d9f56 | |
| parent | 0b47899c1b92b0781367179d4255f99e2bb41518 (diff) | |
| download | extra-cmake-modules-81374904954b8f68616b5b804a322a04016f7259.tar.gz extra-cmake-modules-81374904954b8f68616b5b804a322a04016f7259.tar.bz2 | |
Update Android toolchain files to reality
Summary:
- NDK r18 does not ship GCC anymore, it's only clang now
- same for STL, there's only libc++ there
- API level 14 is not supported either anymore, the minimum supported by
the current NDK is 16
- The minimum supported API level by KF5 right now is 21 though, so use
that as the default
Reviewers: apol
Reviewed By: apol
Subscribers: apol, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D19016
| -rw-r--r-- | toolchain/Android.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index e6bf2255..058fc91a 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -145,9 +145,9 @@ endmacro() set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}") set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm") -set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "4.9") +set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "clang") set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a") -set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14") +set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "21") set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path") @@ -158,7 +158,7 @@ set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE string "Android API set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API}) set(CMAKE_SYSTEM_NAME Android) if (NOT CMAKE_ANDROID_STL_TYPE) - set(CMAKE_ANDROID_STL_TYPE gnustl_shared) + set(CMAKE_ANDROID_STL_TYPE c++_shared) endif() include(${CMAKE_ROOT}/Modules/Platform/Android-GNU.cmake REQUIRED) |