From 4708e1d422bed85ffbfccc95fcdf765c46f1129a Mon Sep 17 00:00:00 2001
From: xufuji456 <839789740@qq.com>
Date: Fri, 7 May 2021 23:38:44 +0800
Subject: [PATCH] pickFirst when there are the same libs
---
app/build.gradle | 3 ++-
app/src/main/AndroidManifest.xml | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index e34c04e..1760038 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,6 @@ android {
}
}
- useLibrary "org.apache.http.legacy"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -49,6 +48,8 @@ android {
packagingOptions {
exclude 'META-INF/proguard/coroutines.pro'
+ pickFirst 'lib/armeabi-v7a/libmp3lame.so'
+ pickFirst 'lib/arm64-v8a/libmp3lame.so'
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea88d15..eefed6c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,10 +24,6 @@
android:theme="@style/AppTheme"
tools:replace="android:name">
-
-