commit 33c98d9ab283913b7b76d8a33e138aafe9724d68
author Jean-Baptiste Queru <jbq@google.com> Tue Apr 10 11:09:40 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 10 11:09:40 2012 -0700
tree 7a77fcb961598570cd2335b718b0ffbf910ce2fe
parent 026e219f780a1d257e78fe80419a10655dc615a8
parent 59d7372dec8b4befa06496b94bd7eef06d506696

am 59d7372d: Merge "Bump DX Java heap to 2GB."

* commit '59d7372dec8b4befa06496b94bd7eef06d506696':
  Bump DX Java heap to 2GB.

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 3a5249c..b678158 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1525,7 +1525,7 @@
 @echo "target Dex: $(PRIVATE_MODULE)"
 @mkdir -p $(dir $@)
 $(hide) $(DX) \
-    $(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx1536M) \
+    $(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx2048M) \
     --dex --output=$@ \
     $(incremental_dex) \
     $(if $(NO_OPTIMIZE_DX), \