Merge "Add Java heap size argument to DexOptions."

3 files changed, 22 insertions, 0 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 86e1af0..6e32247 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -933,6 +933,10 @@ public class AndroidBuilder {
 
         command.add(dx);
 
+        if (dexOptions.getJavaMaxHeapSize() != null) {
+            command.add("-JXmx" + dexOptions.getJavaMaxHeapSize());
+        }
+
         command.add("--dex");
 
         if (mVerboseExec) {
diff --git a/builder/src/main/java/com/android/builder/DexOptions.java b/builder/src/main/java/com/android/builder/DexOptions.java
index 37346a2..966d081 100644
--- a/builder/src/main/java/com/android/builder/DexOptions.java
+++ b/builder/src/main/java/com/android/builder/DexOptions.java
@@ -20,4 +20,5 @@ public interface DexOptions {
 
     boolean isCoreLibrary();
     boolean getIncremental();
+    String getJavaMaxHeapSize();
 }
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy
index d98b87d..4a333e0 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy
@@ -27,6 +27,9 @@ public class DexOptionsImpl implements DexOptions {
     @Input
     private boolean isIncrementalFlag = true
 
+    @Input
+    private String javaMaxHeapSize
+
     public void setCoreLibrary(boolean coreLibrary) {
         coreLibraryFlag = coreLibrary
     }
@@ -44,4 +47,18 @@ public class DexOptionsImpl implements DexOptions {
     boolean getIncremental() {
         return isIncrementalFlag
     }
+
+    public void setJavaMaxHeapSize(String theJavaMaxHeapSize) {
+        if (theJavaMaxHeapSize.matches("\\d+[kKmMgGtT]?")) {
+            javaMaxHeapSize = theJavaMaxHeapSize
+        } else {
+            throw new IllegalArgumentException(
+                    "Invalid max heap size DexOption. See `man java` for valid -Xmx arguments.")
+        }
+    }
+
+    @Override
+    public String getJavaMaxHeapSize() {
+        return javaMaxHeapSize
+    }
 }