summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Carl Shapiro <cshapiro@google.com> 2010-12-08 14:09:32 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-12-08 14:09:32 -0800
commitf4ade58b3eb24c20337ba9608a4b2008fb4a017d (patch)
tree47792fd7b50892fbf8994396a194cca50f1bea09
parentaf8962e48ecf0ff3833084f540ca7e2f05295560 (diff)
parent9e4c884e7a7acd6b75399b180dc339295cda5a43 (diff)
Merge "Add a comment regarding the sizing of the Dalvik heap."
-rw-r--r--core/jni/AndroidRuntime.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 98bdb52d938b..07505a58efde 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -626,14 +626,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt);
//options[curOpt++].optionString = "-verbose:class";
+ /*
+ * The default starting and maximum size of the heap. Larger
+ * values should be specified in a product property override.
+ */
strcpy(heapstartsizeOptsBuf, "-Xms");
- property_get("dalvik.vm.heapstartsize", heapstartsizeOptsBuf+4, "2m");
+ property_get("dalvik.vm.heapstartsize", heapstartsizeOptsBuf+4, "4m");
opt.optionString = heapstartsizeOptsBuf;
mOptions.add(opt);
-
strcpy(heapsizeOptsBuf, "-Xmx");
property_get("dalvik.vm.heapsize", heapsizeOptsBuf+4, "16m");
- //LOGI("Heap size: %s", heapsizeOptsBuf);
opt.optionString = heapsizeOptsBuf;
mOptions.add(opt);