Set QT_ANDROID_ABIS when builing qtbase for Android

When building Qt we need to set QT_ANDROID_ABIS value to CMAKE_ANDROID_ARCH_ABI explictily since the automatical detecting of android ABI is not executed. This fixes build of the qtbase in-tree tests. Fixes: QTBUG-97133 Change-Id: Ica7057bcfcc8f4fe4b5a921ca7449f74cdbca0f1 Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]>
fwcd · Oct 14, 2021 · 6144107 · 6144107
1 parent 5e55297
commit 6144107
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -627,6 +627,12 @@ macro(qt_build_tests)
             # prefix. For super builds it needs to be done in qt5/CMakeLists.txt.
             qt_set_up_fake_standalone_tests_install_prefix()
         endif()
+    else()
+        if(ANDROID)
+            # When building in-tree tests we need to specify the QT_ANDROID_ABIS list. Since we
+            # build Qt for the single ABI, build tests for this ABI only.
+            set(QT_ANDROID_ABIS "${CMAKE_ANDROID_ARCH_ABI}")
+        endif()
     endif()
 
     if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/auto/CMakeLists.txt")