diff options
| -rw-r--r-- | build/phone-hdpi-512-dalvik-heap.mk | 1 | ||||
| -rw-r--r-- | build/phone-hdpi-dalvik-heap.mk | 1 | ||||
| -rw-r--r-- | build/tablet-dalvik-heap.mk | 4 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/build/phone-hdpi-512-dalvik-heap.mk b/build/phone-hdpi-512-dalvik-heap.mk index afc45ee..a7f9d32 100644 --- a/build/phone-hdpi-512-dalvik-heap.mk +++ b/build/phone-hdpi-512-dalvik-heap.mk @@ -19,5 +19,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.heapstartsize=5m \ - dalvik.vm.smallheapsize=32m \ dalvik.vm.heapsize=32m diff --git a/build/phone-hdpi-dalvik-heap.mk b/build/phone-hdpi-dalvik-heap.mk index ee30b92..ab33b96 100644 --- a/build/phone-hdpi-dalvik-heap.mk +++ b/build/phone-hdpi-dalvik-heap.mk @@ -18,5 +18,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.heapstartsize=5m \ - dalvik.vm.smallheapsize=32m \ dalvik.vm.heapsize=32m diff --git a/build/tablet-dalvik-heap.mk b/build/tablet-dalvik-heap.mk index 9cb2f6b..37c3ec5 100644 --- a/build/tablet-dalvik-heap.mk +++ b/build/tablet-dalvik-heap.mk @@ -18,5 +18,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.heapstartsize=5m \ - dalvik.vm.smallheapsize=48m \ - dalvik.vm.heapsize=48m + dalvik.vm.growthlimit=48m \ + dalvik.vm.heapsize=256m diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index f023e94..342b884 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -568,6 +568,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) char jniOptsBuf[sizeof("-Xjniopts:")-1 + PROPERTY_VALUE_MAX]; char heapstartsizeOptsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX]; char heapsizeOptsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX]; + char heapgrowthlimitOptsBuf[sizeof("-XX:HeapGrowthLimit=")-1 + PROPERTY_VALUE_MAX]; char extraOptsBuf[PROPERTY_VALUE_MAX]; char* stackTraceFile = NULL; bool checkJni = false; @@ -659,6 +660,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) opt.optionString = heapsizeOptsBuf; mOptions.add(opt); + strcpy(heapgrowthlimitOptsBuf, "-XX:HeapGrowthLimit="); + property_get("dalvik.vm.heapgrowthlimit", heapgrowthlimitOptsBuf+20, ""); + if (heapgrowthlimitOptsBuf[20] != '\0') { + opt.optionString = heapgrowthlimitOptsBuf; + mOptions.add(opt); + } + /* * Enable or disable dexopt features, such as bytecode verification and * calculation of register maps for precise GC. |