From 68d7b433d8ddaa8b684f3c7eb870a6acdbecf70a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Sat, 1 Feb 2020 20:36:52 +0100
Subject: correct build scripts

---
 build.gradle       | 11 +++++++++--
 gradle.properties  |  3 +++
 proguard-rules.pro |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b0e8a2cc4..7ee0da74a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,6 +128,15 @@ android {
         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 {
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !travisBuild
@@ -169,7 +178,6 @@ android {
                 signingConfig = signingConfigs.release
                 minifyEnabled true
                 shrinkResources true
-                android.enableR8.fullMode=true
                 runProguard true
                 proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             }
@@ -179,7 +187,6 @@ android {
                 buildTypes.release.signingConfig = null
                 minifyEnabled true
                 shrinkResources true
-                android.enableR8.fullMode=true
                 runProguard true
                 proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             }
diff --git a/gradle.properties b/gradle.properties
index 0c0632ee2..4ae591228 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M
+org.gradle.parallel=true
+android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/proguard-rules.pro b/proguard-rules.pro
index bfe8155cd..0b9282d2e 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -12,6 +12,8 @@
   **[] $VALUES;
   public *;
 }
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
 
 -dontwarn org.bouncycastle.mail.**
 -dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
-- 
cgit v1.2.3