aboutsummaryrefslogtreecommitdiff
path: root/toolchain/deployment-file-qt514.json.in
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2020-03-03 19:46:12 +0100
committerVolker Krause <vkrause@kde.org>2020-03-03 19:47:00 +0100
commitc9ebd3917e59192a9b8655c3dd150064a4ae98b4 (patch)
tree328ae5f1a836f0bce83d445d8dfe3cc23fb39459 /toolchain/deployment-file-qt514.json.in
parent040504da64aa5c623d2ab5907f8d36003ba57e9f (diff)
downloadextra-cmake-modules-c9ebd3917e59192a9b8655c3dd150064a4ae98b4.tar.gz
extra-cmake-modules-c9ebd3917e59192a9b8655c3dd150064a4ae98b4.tar.bz2
Support NDK r20 and Qt 5.14
Summary: This changes from using the toolchain file provided by CMake to using the one provided by the NDK, as even recent CMake can't build successfully with r20. However this is a rather invasive change, the interface and variable names differ. The Qt 5.14 changes are less risky, as most of this is parallel to the support for older versions. Test Plan: Local builds with 5.14/r20, 5.14/r18 work, the Docker SDK isn't tested yet, and there's some remaining issues with 5.13 and older NDKs I don't fully understand yet. The resulting apks with 5.14 install, and work for QQC2 content, but fail to start Kirigami apps. Reviewers: apol Reviewed By: apol Subscribers: flherne, apol, kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Maniphest Tasks: T12520 Differential Revision: https://phabricator.kde.org/D26749
Diffstat (limited to 'toolchain/deployment-file-qt514.json.in')
-rw-r--r--toolchain/deployment-file-qt514.json.in18
1 files changed, 18 insertions, 0 deletions
diff --git a/toolchain/deployment-file-qt514.json.in b/toolchain/deployment-file-qt514.json.in
new file mode 100644
index 00000000..ac069c4d
--- /dev/null
+++ b/toolchain/deployment-file-qt514.json.in
@@ -0,0 +1,18 @@
+{
+ "qt": "@_qt5Core_install_prefix@",
+ "sdk": "@ANDROID_SDK_ROOT@",
+ "ndk": "@CMAKE_ANDROID_NDK@",
+ "toolchain-prefix": "llvm",
+ "tool-prefix": "llvm",
+ "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@",
+ "application-binary": "@QTANDROID_EXPORTED_TARGET@",
+ "qml-root-path": "@CMAKE_SOURCE_DIR@",
+ @DEFINE_QML_IMPORT_PATHS@
+ ##EXTRALIBS##
+ ##EXTRAPLUGINS##
+ "android-package-source-directory": "$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>",
+ "stdcpp-path": "@CMAKE_SYSROOT@/usr/lib",
+ "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
+ "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ],
+ "architectures": { "@CMAKE_ANDROID_ARCH_ABI@": "@ECM_ANDROID_STL_ARCH@" }
+}