From 6e875d46322768787f792a3352ed99887f700751 Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:12:56 +0700
Subject: [PATCH] android: disable compression and extraction of libs

---
 apps/multiplatform/android/build.gradle.kts             | 2 --
 apps/multiplatform/android/src/main/AndroidManifest.xml | 1 -
 scripts/android/compress-and-sign-apk.sh                | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts
index 250616ea5c..8b12dd3c01 100644
--- a/apps/multiplatform/android/build.gradle.kts
+++ b/apps/multiplatform/android/build.gradle.kts
@@ -32,7 +32,6 @@ android {
         }
         manifestPlaceholders["app_name"] = "@string/app_name"
         manifestPlaceholders["provider_authorities"] = "chat.simplex.app.provider"
-        manifestPlaceholders["extract_native_libs"] = rootProject.extra["compression.level"] as Int != 0
     }
 
     buildTypes {
@@ -75,7 +74,6 @@ android {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
-        jniLibs.useLegacyPackaging = rootProject.extra["compression.level"] as Int != 0
     }
     android.sourceSets["main"].assets.setSrcDirs(listOf("../common/src/commonMain/resources/assets"))
     val isRelease = gradle.startParameter.taskNames.find { it.lowercase().contains("release") } != null
diff --git a/apps/multiplatform/android/src/main/AndroidManifest.xml b/apps/multiplatform/android/src/main/AndroidManifest.xml
index deb5d83e5f..c042b15a26 100644
--- a/apps/multiplatform/android/src/main/AndroidManifest.xml
+++ b/apps/multiplatform/android/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
       android:fullBackupOnly="false"
       android:icon="@mipmap/icon"
       android:label="${app_name}"
-      android:extractNativeLibs="${extract_native_libs}"
       android:supportsRtl="true"
       android:theme="@style/Theme.SimpleX">
     <!--      android:localeConfig="@xml/locales_config"-->
diff --git a/scripts/android/compress-and-sign-apk.sh b/scripts/android/compress-and-sign-apk.sh
index 74d59203c4..d7a9dffc78 100755
--- a/scripts/android/compress-and-sign-apk.sh
+++ b/scripts/android/compress-and-sign-apk.sh
@@ -32,6 +32,7 @@ for ORIG_NAME in "${ORIG_NAMES[@]}"; do
     (cd apk && zip -r -q -"$level" ../"$ORIG_NAME" .)
     # Shouldn't be compressed because of Android requirement
     (cd apk && zip -r -q -0 ../"$ORIG_NAME" resources.arsc)
+    (cd apk && zip -r -q -0 ../"$ORIG_NAME" lib/**/*.so)
 
     if [ $case_insensitive -eq 1 ]; then
         # For case-insensitive file systems