Bug 1727438 - Increase java max heap to 16G. r=nalexander

Looks like 6G is not enough for an ASAN build when updating the gradle version. I tried 8G on try but that's not enough either. Differential Revision: https://phabricator.services.mozilla.com/D123970
dothq · Aug 30, 2021 · d15794b · d15794b
1 parent c859adb
commit d15794b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=true
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx6656M
+org.gradle.jvmargs=-Xmx16384M
 android.useAndroidX=true
diff --git a/mobile/android/examples/messaging_example/app/build.gradle b/mobile/android/examples/messaging_example/app/build.gradle
@@ -12,6 +12,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    dexOptions {
+        javaMaxHeapSize "16g"
+    }
     defaultConfig {
         applicationId "org.mozilla.geckoview.example.messaging"
         targetSdkVersion project.ext.targetSdkVersion

diff --git a/mobile/android/examples/port_messaging_example/app/build.gradle b/mobile/android/examples/port_messaging_example/app/build.gradle
@@ -12,6 +12,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    dexOptions {
+        javaMaxHeapSize "16g"
+    }
     defaultConfig {
         applicationId "org.mozilla.geckoview.example.messaging"
         targetSdkVersion project.ext.targetSdkVersion

diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
@@ -137,7 +137,7 @@ android {
     }
 
     dexOptions {
-        javaMaxHeapSize "6g"
+        javaMaxHeapSize "16g"
     }
 
     lintOptions {

diff --git a/mobile/android/geckoview_example/build.gradle b/mobile/android/geckoview_example/build.gradle
@@ -26,7 +26,7 @@ android {
     }
 
     dexOptions {
-        javaMaxHeapSize "6g"
+        javaMaxHeapSize "16g"
     }
 
     buildTypes {

diff --git a/mobile/android/gradle/dotgradle-offline/gradle.properties b/mobile/android/gradle/dotgradle-offline/gradle.properties
@@ -1,4 +1,4 @@
 // Per https://docs.gradle.org/current/userguide/build_environment.html, this
 // overrides the gradle.properties in topsrcdir.
 org.gradle.daemon=false
-org.gradle.jvmargs=-Xmx6656M
+org.gradle.jvmargs=-Xmx16384M
diff --git a/mobile/android/gradle/dotgradle-online/gradle.properties b/mobile/android/gradle/dotgradle-online/gradle.properties
@@ -1,4 +1,4 @@
 // Per https://docs.gradle.org/current/userguide/build_environment.html, this
 // overrides the gradle.properties in topsrcdir.
 org.gradle.daemon=false
-org.gradle.jvmargs=-Xmx6656M
+org.gradle.jvmargs=-Xmx16384M