diff options
| author | Adam Metcalf <gamblore@google.com> | 2013-07-30 22:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-30 22:20:10 +0000 |
| commit | b22d66478b16b270f263c0556f18ee4dd836fb21 (patch) | |
| tree | ee92ca8ee5e0741331b1e4bed077dfe8d1d0c81b /builder/src/main/java/com/android | |
| parent | 66aa0767fa5129d5f2b4ce1bb12da06e9dd0ecbe (diff) | |
| parent | 11a54bc85ae67470ad1f4dbd7213fb84f8d71a95 (diff) | |
| download | build-b22d66478b16b270f263c0556f18ee4dd836fb21.tar.gz | |
Merge "Add Java heap size argument to DexOptions."
Diffstat (limited to 'builder/src/main/java/com/android')
| -rw-r--r-- | builder/src/main/java/com/android/builder/AndroidBuilder.java | 4 | ||||
| -rw-r--r-- | builder/src/main/java/com/android/builder/DexOptions.java | 1 |
2 files changed, 5 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(); } |