From 8e0324dbd8aef51d85ed81e645129c74dc6ab945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 29 Apr 2016 17:27:28 +0200
Subject: Update build config, gitignore after testing

---
 OpenKeychain/build.gradle | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/build.gradle')

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 04106939c..1ea19cbcb 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -268,10 +268,11 @@ android {
 
     dexOptions {
         incremental = true
-        // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
-        preDexLibraries = false
+        preDexLibraries = true
+        // dexInProcess requires much RAM, which is not available on all dev systems
+        dexInProcess = false
         jumboMode = true
-        javaMaxHeapSize "2g"
+        javaMaxHeapSize "4g"
     }
 
     packagingOptions {
@@ -285,8 +286,6 @@ android {
     }
 }
 
-// apply plugin: 'spoon'
-
 task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") {
     group = "Reporting"
     description = "Generate Jacoco coverage reports"
-- 
cgit v1.2.3