diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-11-16 19:17:45 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-11-19 16:16:02 +0100 |
| commit | 06061b0e3ce4342b5cbb1c0e6c8d285b524e30f0 (patch) | |
| tree | fbd21d3b48965aff7cec9751a8640b521e2f2ae2 /toolchain/deployment-file.json.in | |
| parent | 96d169b87292d935646b1924952829b0f4d5d669 (diff) | |
| download | extra-cmake-modules-06061b0e3ce4342b5cbb1c0e6c8d285b524e30f0.tar.gz extra-cmake-modules-06061b0e3ce4342b5cbb1c0e6c8d285b524e30f0.tar.bz2 | |
Android: improve clang support
Summary:
Infer the toolchain we are using through cmake's detection of ranlib
instead of asking the user to fill it.
It's only used in androiddeployqt and cmake expects it to be version
"clang" for clang builds while androiddeployqt expects it to be "4.9".
Reviewers: #build_system, #android, vkrause
Reviewed By: #android, vkrause
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D16930
Diffstat (limited to 'toolchain/deployment-file.json.in')
| -rw-r--r-- | toolchain/deployment-file.json.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 2b9b44f1..907401b9 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -2,9 +2,9 @@ "qt": "@_qt5Core_install_prefix@", "sdk": "@ANDROID_SDK_ROOT@", "ndk": "@CMAKE_ANDROID_NDK@", - "toolchain-prefix": "@ANDROID_TOOLCHAIN@", - "tool-prefix": "@ANDROID_COMPILER_PREFIX@", - "toolchain-version": "@CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION@", + "toolchain-prefix": "##ANDROID_TOOL_PREFIX##", + "tool-prefix": "##ANDROID_COMPILER_PREFIX##", + "toolchain-version": "##ANDROID_TOOLCHAIN_VERSION##", "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", |