Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b098f735 authored by Carl Shapiro's avatar Carl Shapiro Committed by Android (Google) Code Review
Browse files

Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb

parents 8f36bedc 8cdf27c3

build/phone-hdpi-512-dalvik-heap.mk

+0 −1
Original line number Diff line number Diff line
@@ -19,5 +19,4 @@ 


PRODUCT_PROPERTY_OVERRIDES += \

    dalvik.vm.heapstartsize=5m \

    dalvik.vm.smallheapsize=32m \

    dalvik.vm.heapsize=32m

build/phone-hdpi-dalvik-heap.mk

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ 


PRODUCT_PROPERTY_OVERRIDES += \

    dalvik.vm.heapstartsize=5m \

    dalvik.vm.smallheapsize=32m \

    dalvik.vm.heapsize=32m

build/tablet-dalvik-heap.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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.