commit 4f85cc54b3347e00e32a07cae4fd5473987b71af
author The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:50:54 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:50:54 2009 -0800
tree f1b5a1212c9ba3b4cf9d69855d653991886d9181
parent dcc08f073b6873c69ab891d4f69f7c568e282df7

auto import from //branches/cupcake/...@125939

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index c88c048..a24837b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1147,11 +1147,13 @@
 @rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
 endef
 
+#TODO: use a smaller -Xmx value for most libraries;
+#      only core.jar and framework.jar need a heap this big.
 define transform-classes.jar-to-dex
 @echo "target Dex: $(PRIVATE_MODULE)"
 @mkdir -p $(dir $@)
 $(hide) $(DX) -JXms16M \
-    $(if $(GENERATE_DEX_DEBUG), -JXmx1536M, -JXmx1280M) \
+    -JXmx1536M \
     --dex --output=$@ \
     $(if $(NO_OPTIMIZE_DX), \
         --no-optimize) \