correct build scripts
This commit is contained in:
parent
a669e200b5
commit
68d7b433d8
3 changed files with 14 additions and 2 deletions
11
build.gradle
11
build.gradle
|
@ -128,6 +128,15 @@ android {
|
||||||
enabled true
|
enabled true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
packagingOptions {
|
||||||
|
//X86
|
||||||
|
exclude "lib/x86/libconscrypt_jni.so"
|
||||||
|
exclude "lib/x86/libpl_droidsonroids_gif.so"
|
||||||
|
//X86_64
|
||||||
|
exclude "lib/x86_64/libconscrypt_jni.so"
|
||||||
|
exclude "lib/x86_64/libpl_droidsonroids_gif.so"
|
||||||
|
}
|
||||||
|
|
||||||
dexOptions {
|
dexOptions {
|
||||||
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
|
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
|
||||||
preDexLibraries = preDexEnabled && !travisBuild
|
preDexLibraries = preDexEnabled && !travisBuild
|
||||||
|
@ -169,7 +178,6 @@ android {
|
||||||
signingConfig = signingConfigs.release
|
signingConfig = signingConfigs.release
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources true
|
shrinkResources true
|
||||||
android.enableR8.fullMode=true
|
|
||||||
runProguard true
|
runProguard true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
@ -179,7 +187,6 @@ android {
|
||||||
buildTypes.release.signingConfig = null
|
buildTypes.release.signingConfig = null
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources true
|
shrinkResources true
|
||||||
android.enableR8.fullMode=true
|
|
||||||
runProguard true
|
runProguard true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
org.gradle.jvmargs=-Xmx2048M
|
org.gradle.jvmargs=-Xmx2048M
|
||||||
|
org.gradle.parallel=true
|
||||||
|
android.enableR8=true
|
||||||
|
android.enableR8.fullMode=false
|
||||||
|
|
2
proguard-rules.pro
vendored
2
proguard-rules.pro
vendored
|
@ -12,6 +12,8 @@
|
||||||
**[] $VALUES;
|
**[] $VALUES;
|
||||||
public *;
|
public *;
|
||||||
}
|
}
|
||||||
|
-keep class com.squareup.okhttp.** { *; }
|
||||||
|
-keep interface com.squareup.okhttp.** { *; }
|
||||||
|
|
||||||
-dontwarn org.bouncycastle.mail.**
|
-dontwarn org.bouncycastle.mail.**
|
||||||
-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
|
-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
|
||||||
|
|
Reference in a new issue