From d41ef4f741b9b4a26694aab2ebfd9b0e130d8785 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 30 Apr 2021 17:15:33 +0200
Subject: [PATCH] Add ABI suffix to .prl files for Android

The libraries already contain the ABI suffix, and the .prl files should
too. This is a requirement for ABI-stitching of Qt Android builds.

Fixes: QTBUG-90023
Change-Id: Ib2a7b3119ace14c8542242fc45f42648840d053a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtPrlHelpers.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
index 29555f1fb35..f843fb4bbed 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -329,7 +329,11 @@ function(qt_generate_prl_file target install_dir)
                  "${prl_meta_info_name_prefix}$<CONFIG>${prl_meta_info_name_suffix}")
 
     # The final prl file name that will be embedded in the file above.
-    set(final_prl_file_name "${prefix_for_final_prl_name}$<TARGET_FILE_BASE_NAME:${target}>.prl")
+    set(final_prl_file_name "${prefix_for_final_prl_name}$<TARGET_FILE_BASE_NAME:${target}>")
+    if(ANDROID)
+        string(APPEND final_prl_file_name "_${CMAKE_ANDROID_ARCH_ABI}")
+    endif()
+    string(APPEND final_prl_file_name ".prl")
     qt_path_join(final_prl_file_path "${QT_BUILD_DIR}/${install_dir}" "${final_prl_file_name}")
 
     # Generate the prl content and its final file name into configuration specific files