Fix Android build from multi-arch qmake changes

Add condition replacements for the android ABIs.

Add a replacement for QT_ARCH to ANDROID_ABI, since QT_ARCH is only used
with the android build for now.

Change-Id: I553d7910546de32236f723ec2e9a05a18da76130
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 74da7af125..0f9b17ff01 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -315,7 +315,7 @@ extend_target(Core CONDITION ANDROID
         kernel/qsharedmemory_android.cpp
         kernel/qsystemsemaphore_android.cpp
     DEFINES
-        LIBS_SUFFIX='\\"_.so\\"'
+        LIBS_SUFFIX='\\"_${ANDROID_ABI}.so\\"'
 )
 
 extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index c42a3e598d..e263df82d0 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -399,7 +399,7 @@ extend_target(Core CONDITION ANDROID
         kernel/qsharedmemory_android.cpp
         kernel/qsystemsemaphore_android.cpp
     DEFINES
-        LIBS_SUFFIX='\\"_.so\\"'
+        LIBS_SUFFIX="\\\\"_${ANDROID_ABI}.so\\\\"" # special case
 )
 
 extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 341f18bb9b..3e0f11ccf5 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -471,14 +471,14 @@ if(NOT ANDROID)
     )
 endif()
 
-extend_target(Gui CONDITION ANDROID AND arm64-v8a
+extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64
     SOURCES
         image/qimage_neon.cpp
         painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
         painting/qimagescale_neon.cpp
 )
 
-extend_target(Gui CONDITION ANDROID AND (x86 OR x86_64)
+extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL x86 OR TEST_architecture_arch STREQUAL x86_64)
     SOURCES
         image/qimage_ssse3.cpp
         painting/qdrawhelper_sse2.cpp
@@ -545,7 +545,7 @@ if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_arch
     )
 endif()
 
-extend_target(Gui CONDITION ANDROID AND x86_64
+extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
     SOURCES
         painting/qdrawhelper_sse4.cpp
         painting/qimagescale_sse4.cpp
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index c7645e9105..9f0b07d929 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -553,14 +553,14 @@ if(NOT ANDROID)
     )
 endif()
 
-extend_target(Gui CONDITION ANDROID AND arm64-v8a
+extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64
     SOURCES
         image/qimage_neon.cpp
         painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
         painting/qimagescale_neon.cpp
 )
 
-extend_target(Gui CONDITION ANDROID AND (x86 OR x86_64)
+extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL x86 OR TEST_architecture_arch STREQUAL x86_64)
     SOURCES
         image/qimage_ssse3.cpp
         painting/qdrawhelper_sse2.cpp
@@ -636,7 +636,7 @@ if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_arch
     )
 endif()
 
-extend_target(Gui CONDITION ANDROID AND x86_64
+extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
     SOURCES
         painting/qdrawhelper_sse4.cpp
         painting/qimagescale_sse4.cpp