diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-04-24 13:59:21 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-04-27 12:21:29 +0200 |
| commit | bd24bf740c08352b311c27864cc2028d0d0ab80a (patch) | |
| tree | 2e4e3dde906decb63222b0605a165f689f25fec3 /cmake/QtPlatformAndroid.cmake | |
| parent | dccf28b7c344822b7459635099ebe3abdf5fd107 (diff) | |
| download | qtbase-bd24bf740c08352b311c27864cc2028d0d0ab80a.tar.gz | |
CMake: Fix wrong arm64 architecture
Due to the wrong string comparison, we were writing out the wrong
architecture for the arm64 builds to the deployment settings json file.
This leads to androiddeployqt tool not being able to locate the
stdlibc++.
Change-Id: I3d13b14c27f043445bf46aaca0e9f862f6ca84e5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPlatformAndroid.cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 4b5bf6ff13..24360cec67 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -217,7 +217,7 @@ function(qt_android_generate_deployment_settings target) set(arch_value "i686-linux-android") elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") set(arch_value "x86_64-linux-android") - elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "armv64-v8a") + elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set(arch_value "aarch64-linux-android") else() set(arch_value "arm-linux-androideabi") |