From a930e657edbc4dcd1437f3f4146a4e46e0ce2d62 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 17 Aug 2020 10:44:14 +0200 Subject: [PATCH] CMake: Fix what Android plugin suffix should be passed as a define CMAKE_SYSTEM_PROCESSOR has the value i686 when targeting the x86 Android ABI, which is set by the Android CMake toolchain. This is not the value that Qt expects, and potentially breaks loading of Qt plugins. The same with aarch64 instead of arm64-v8a. In qmake the proper values for QT_ARCH variable are the equivalent of the ANDROID_ABI variable set by the CMake toolchain file, so use ANDROID_ABI. Task-number: QTBUG-85399 Change-Id: Ia2eaceb75168cddb2d28414f1f4bf481ec76f29e Reviewed-by: Joerg Bornemann --- src/corelib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 6f78e2bdc68..eef80acd2a9 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -436,7 +436,7 @@ qt_extend_target(Core CONDITION ANDROID kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp DEFINES - LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" + LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case ) qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")