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

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

Merge "Add a property to set the starting size of a VM."

parents f30c8287 38cfa8ca

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char dexoptFlagsBuf[PROPERTY_VALUE_MAX];

    char enableAssertBuf[sizeof("-ea:")-1 + PROPERTY_VALUE_MAX];

    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 extraOptsBuf[PROPERTY_VALUE_MAX];

    char* stackTraceFile = NULL;
@@ -650,6 +651,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    mOptions.add(opt);

    //options[curOpt++].optionString = "-verbose:class";



    strcpy(heapstartsizeOptsBuf, "-Xms");

    property_get("dalvik.vm.heapstartsize", heapstartsizeOptsBuf+4, "2m");

    opt.optionString = heapstartsizeOptsBuf;

    mOptions.add(opt);



    strcpy(heapsizeOptsBuf, "-Xmx");

    property_get("dalvik.vm.heapsize", heapsizeOptsBuf+4, "16m");

    //LOGI("Heap size: %s", heapsizeOptsBuf);