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

Commit 64a636c8 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev 

am: 2baa3932

Change-Id: I5c35bae390870d6582d863e16013afb897117d0b
parents 28aeb518 2baa3932

core/jni/AndroidRuntime.cpp

+7 −0
Original line number Diff line number Diff line
@@ -610,6 +610,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    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 foregroundHeapGrowthMultiplierOptsBuf[

            sizeof("-XX:ForegroundHeapGrowthMultiplier=")-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];
@@ -713,6 +715,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
                       heaptargetutilizationOptsBuf,

                       "-XX:HeapTargetUtilization=");



    /* Foreground heap growth multiplier option */

    parseRuntimeOption("dalvik.vm.foreground-heap-growth-multiplier",

                       foregroundHeapGrowthMultiplierOptsBuf,

                       "-XX:ForegroundHeapGrowthMultiplier=");



    /*

     * JIT related options.

     */