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

Commit ac038f3b authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolved conflicts for merge of 844e44c9 to master 

Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
parents bb664e12 844e44c9

core/jni/AndroidRuntime.cpp

+5 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];

    char cachePruneBuf[sizeof("-Xzygote-max-boot-retry=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmsFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
@@ -829,6 +830,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    snprintf(cpuAbiListBuf, sizeof(cpuAbiListBuf), "--cpu-abilist=%s", propBuf);

    addOption(cpuAbiListBuf);



    // Dalvik-cache pruning counter.

    parseRuntimeOption("dalvik.vm.zygote.max-boot-retry", cachePruneBuf,

                       "-Xzygote-max-boot-retry=");



    initArgs.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();

    initArgs.nOptions = mOptions.size();