pickFirst when there are the same libs

pull/190/head
xufuji456 4 years ago
parent 8fa60d3e3a
commit 4708e1d422
  1. 3
      app/build.gradle
  2. 4
      app/src/main/AndroidManifest.xml

@ -41,7 +41,6 @@ android {
} }
} }
useLibrary "org.apache.http.legacy"
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
@ -49,6 +48,8 @@ android {
packagingOptions { packagingOptions {
exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/proguard/coroutines.pro'
pickFirst 'lib/armeabi-v7a/libmp3lame.so'
pickFirst 'lib/arm64-v8a/libmp3lame.so'
} }
} }

@ -24,10 +24,6 @@
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="android:name"> tools:replace="android:name">
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />
<activity android:name=".activity.MainActivity"> <activity android:name=".activity.MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

Loading…
Cancel
Save