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

Commit 1281fb6a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21862 into eclair 

* changes:
  Fix issue #2010965: Increase process size on WVGA devices
parents 6794e1ba bdcef70e

core/jni/AndroidRuntime.cpp

+5 −10
Original line number Diff line number Diff line
@@ -525,6 +525,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 heapsizeOptsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];

    char* stackTraceFile = NULL;

    bool checkJni = false;

    bool checkDexSum = false;
@@ -597,16 +598,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    mOptions.add(opt);

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



#ifdef CUSTOM_RUNTIME_HEAP_MAX

#define __make_max_heap_opt(val) #val

#define _make_max_heap_opt(val) "-Xmx" __make_max_heap_opt(val)

    opt.optionString = _make_max_heap_opt(CUSTOM_RUNTIME_HEAP_MAX);

#undef __make_max_heap_opt

#undef _make_max_heap_opt

#else

    /* limit memory use to 16MB */

    opt.optionString = "-Xmx16m";

#endif

    strcpy(heapsizeOptsBuf, "-Xmx");

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

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

    opt.optionString = heapsizeOptsBuf;

    mOptions.add(opt);



    /*