diff --git a/app/build.gradle b/app/build.gradle
index fa1e65c6f..681d9e2b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,12 +92,15 @@ android {
             outputFileName = "linphone-android-${variant.buildType.name}-${project.version}.apk"
         }
 
+        // https://developer.android.com/studio/releases/gradle-plugin#3-6-0-behavior for extractNativeLibs
         if (variant.buildType.name == "release") {
             variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address",
-                                    linphone_file_provider: getPackageName() + ".provider"]
+                                    linphone_file_provider: getPackageName() + ".provider",
+                                    extractNativeLibs: "false"]
         } else {
             variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address",
-                                    linphone_file_provider: getPackageName() + ".debug.provider"]
+                                    linphone_file_provider: getPackageName() + ".debug.provider",
+                                    extractNativeLibs: "true"]
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f8efe69b..05f552aef 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,6 +65,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:resizeableActivity="true"
         android:theme="@style/LinphoneStyle"
+        android:extractNativeLibs="${extractNativeLibs}"
         android:requestLegacyExternalStorage="true">
 
         <!-- Starting activities -->