diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-04-06 14:17:12 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-04-11 15:44:26 +0200 |
| commit | 4baac2ecae1f23723d4fde4f346bdaa54112d9a2 (patch) | |
| tree | 0bf747ce7d1a2371990687a52d306cfb0db587f7 /toolchain/deployment-file.json.in | |
| parent | 731ba7036effcc430f98031e7f2a9826f6234cba (diff) | |
| download | extra-cmake-modules-4baac2ecae1f23723d4fde4f346bdaa54112d9a2.tar.gz extra-cmake-modules-4baac2ecae1f23723d4fde4f346bdaa54112d9a2.tar.bz2 | |
Android: Explicitly point at upstream documentation and deprecate duplicated concepts
Summary: Mark as deprecated the redundant variables and focus on the difference.
Reviewers: #build_system, #frameworks, vkrause
Reviewed By: vkrause
Subscribers: vkrause
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D11984
Diffstat (limited to 'toolchain/deployment-file.json.in')
| -rw-r--r-- | toolchain/deployment-file.json.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 4eb579b5..f213f121 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -1,10 +1,10 @@ { "qt": "@_qt5Core_install_prefix@", "sdk": "@ANDROID_SDK_ROOT@", - "ndk": "@ANDROID_NDK@", + "ndk": "@CMAKE_ANDROID_NDK@", "toolchain-prefix": "@ANDROID_TOOLCHAIN@", "tool-prefix": "@ANDROID_COMPILER_PREFIX@", - "toolchain-version": "@ANDROID_GCC_VERSION@", + "toolchain-version": "@CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION@", "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", |