From f45816565ec07fa5e968dddefdca0a00bb97ac34 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Tue, 13 Jun 2023 11:51:30 +0530
Subject: [PATCH] Fixed setting android:extractNativeLibs=false in manifest
 file is deprecated

---
 app/src/main/AndroidManifest.xml                        | 1 -
 buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt | 1 +
 core/src/main/AndroidManifest.xml                       | 1 -
 custom/src/main/AndroidManifest.xml                     | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ac0464ff2..ab9a11946 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,6 @@
   <application
     android:name=".KiwixApp"
     android:allowBackup="true"
-    android:extractNativeLibs="false"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 694dc2caa..7f2cdcba0 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -128,6 +128,7 @@ class AllProjectConfigurer {
           add("META-INF/notice.txt")
           add("META-INF/ASL2.0")
         }
+        jniLibs.useLegacyPackaging = false
       }
       sourceSets {
         getByName("test") {
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index c89416a47..25f429db5 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -20,7 +20,6 @@
 
   <application
     android:allowBackup="true"
-    android:extractNativeLibs="false"
     android:fullBackupContent="@xml/backup_rules"
     android:dataExtractionRules = "@xml/data_extraction_rules"
     android:hardwareAccelerated="true"
diff --git a/custom/src/main/AndroidManifest.xml b/custom/src/main/AndroidManifest.xml
index f4c59297d..4d2cb5a53 100644
--- a/custom/src/main/AndroidManifest.xml
+++ b/custom/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
 
   <application
     android:name=".CustomApp"
-    android:extractNativeLibs="false"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"