From 3a9aba287ce92f5250c1b68d0e2a39a5f25c031d Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 6 Oct 2021 12:32:01 +0300
Subject: [PATCH] Android: set useLegacyPackaging to true in build.gradle

Since we set android:extractNativeLibs to "true" in AndroidManifest.xml,
a warning is thrown by the gradle build, which needs the property
packagingOptions.jniLibs.useLegacyPackaging to be set to true.

Pick-to: 6.2 6.3 5.15
Change-Id: I725d2663d68ab88abfda630f8a61666510043967
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ramon Sadornil <ramon.sadornil@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
---
 src/android/templates/AndroidManifest.xml                      | 1 -
 src/android/templates/build.gradle                             | 3 +++
 .../templates/doc/src/android-manifest-file-configuration.qdoc | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index a1a07f7bee..d7438317b8 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -13,7 +13,6 @@
         android:smallScreens="true" />
     <application
         android:name="org.qtproject.qt.android.bindings.QtApplication"
-        android:extractNativeLibs="true"
         android:hardwareAccelerated="true"
         android:label="-- %%INSERT_APP_NAME%% --"
         android:requestLegacyExternalStorage="true"
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle
index 0a8601c42a..4c711790f8 100644
--- a/src/android/templates/build.gradle
+++ b/src/android/templates/build.gradle
@@ -38,6 +38,9 @@ android {
     buildToolsVersion androidBuildToolsVersion
     ndkVersion androidNdkVersion
 
+    // Extract native libraries from the APK
+    packagingOptions.jniLibs.useLegacyPackaging true
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
index 792ceae5d9..434b3d0f38 100644
--- a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
+++ b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
@@ -99,9 +99,6 @@ Qt sets the following manifest configuration by default:
 \row
     \li android:label
     \li The application name label. Default value is the Qt project's target name.
-\row
-    \li android:extractNativeLibs
-    \li Extracts the native C++ libraries on installation. The default value is \c true.
 \row
     \li android:hardwareAccelerated
     \li Sets hardware acceleration preference. The default value is \c true.