From d052236a2fab08d52d2ba6dbd7780e8aaf1bfec0 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 11 Aug 2022 10:14:42 +0200
Subject: [PATCH] CMake: Add QT_ANDROID_SIGN_AAB variable

[ChangeLog][CMake] Added the QT_ANDROID_SIGN_AAB variable that can be
set to ON to enable signing of .aab packages.

Fixes: QTBUG-105529
Change-Id: Ic06cc452851dc81b10a2721b544641cb5eeea8be
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 042290d0fb8ea99b2e6c6a5f17359ffc58222ded)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/Qt6AndroidMacros.cmake            |  6 +++++
 .../src/cmake/cmake-configure-variables.qdoc  | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 58453f0c5fe..4b710229609 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -388,9 +388,14 @@ function(qt6_android_add_apk_target target)
         COMMENT "Copying ${target} binary to apk folder"
     )
 
+    set(sign_apk "")
     if(QT_ANDROID_SIGN_APK)
         set(sign_apk "--sign")
     endif()
+    set(sign_aab "")
+    if(QT_ANDROID_SIGN_AAB)
+        set(sign_aab "--sign")
+    endif()
 
     set(extra_args "")
     if(QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP)
@@ -460,6 +465,7 @@ function(qt6_android_add_apk_target target)
             --output ${apk_final_dir}
             --apk ${apk_final_file_path}
             --aab
+            ${sign_aab}
             ${extra_args}
         COMMENT "Creating AAB for ${target}"
     )
diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
index 116e08fef48..32f65a8722f 100644
--- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
@@ -155,6 +155,31 @@ Each variable can be used to specify the path to Qt for Android for the correspo
 \sa{cmake-variable-QT_ANDROID_ABIS}{QT_ANDROID_ABIS}
 */
 
+/*!
+\page cmake-variable-QT_ANDROID_SIGN_AAB.html
+\ingroup cmake-variables-qtcore
+
+\title QT_ANDROID_SIGN_AAB
+\target cmake-variable-QT_ANDROID_SIGN_AAB
+
+\summary {Sign the .aab package with the specified keystore, alias and store password.}
+\cmakevariablesince 6.4
+\preliminarycmakevariable
+\cmakevariableandroidonly
+
+Sign the resulting package. The path of the keystore file, the alias of the key and passwords
+have to be specified by additional environment variables:
+\badcode
+    QT_ANDROID_KEYSTORE_PATH
+    QT_ANDROID_KEYSTORE_ALIAS
+    QT_ANDROID_KEYSTORE_STORE_PASS
+    QT_ANDROID_KEYSTORE_KEY_PASS
+\endcode
+Mentioned variables are used internally by \l{androiddeployqt}.
+
+\sa{androiddeployqt}
+*/
+
 /*!
 \page cmake-variable-QT_ANDROID_SIGN_APK.html
 \ingroup cmake-variables-qtcore