From acf97062f9d02c0fd7345444654b77f357934d48 Mon Sep 17 00:00:00 2001
From: Teng-pao Yu <osimpleo@gmail.com>
Date: Thu, 8 Jun 2017 15:23:28 +0800
Subject: [PATCH] Bug 1370156 part 2 - Enable jumbo mode: in all Gradle builds;
 r=nalexander

MozReview-Commit-ID: HFc7rgl4765

--HG--
extra : rebase_source : 55b95b8e12a379e34c1f4ebaef93b3c5eba69ff9
---
 mobile/android/app/build.gradle | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 9cfb517b7f75..0dd05003e80f 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -38,6 +38,7 @@ android {
 
     dexOptions {
         javaMaxHeapSize "2g"
+        jumboMode = true
     }
 
     lintOptions {
@@ -45,14 +46,6 @@ android {
     }
 
     buildTypes {
-        // Bug 1367768: With current code, we need jumboMode for a string table larger than 65536.
-        // To not interrupt release 55 nightly to beta merge, jumboMode only applies to debug now
-        // and will apply to all builds very soon (Mid June 2017, see bug 1370156).
-        debug {
-            dexOptions {
-                jumboMode = true
-            }
-        }
         // We have the following difficult situation.  Minification (Proguard) is only available per
         // Android-Gradle `buildType`.  Instrumentation (Robocop) is only available for exactly one
         // `buildType` (see Android-Gradle `testBuildType`, which defaults to "debug").  Local