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

Commit 823b1173 authored by Calin Juravle's avatar Calin Juravle
Browse files

resolve merge conflicts of 5ec97664 to nyc-dev-plus-aosp 

Change-Id: I503978b0ebabee4401ae955d92d0c073b8ff9b14
parents e4e690b6 5ec97664

core/jni/AndroidRuntime.cpp

+4 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char jitinitialsizeOptsBuf[sizeof("-Xjitinitialsize:")-1 + PROPERTY_VALUE_MAX];

    char jitthresholdOptsBuf[sizeof("-Xjitthreshold:")-1 + PROPERTY_VALUE_MAX];

    char useJitProfilesOptsBuf[sizeof("-Xjitsaveprofilinginfo:")-1 + PROPERTY_VALUE_MAX];

    char jitprithreadweightOptBuf[sizeof("-Xjitprithreadweight:")-1 + PROPERTY_VALUE_MAX];

    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];
@@ -701,6 +702,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    if (strcmp(useJitProfilesOptsBuf, "true") == 0) {

        addOption("-Xjitsaveprofilinginfo");

    }

    parseRuntimeOption("dalvik.vm.jitprithreadweight",

                       jitprithreadweightOptBuf,

                       "-Xjitprithreadweight:");



    property_get("ro.config.low_ram", propBuf, "");

    if (strcmp(propBuf, "true") == 0) {