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

Commit 9f52d0a1 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Add gctype device config property for GC experiments"

parents 08577fc5 d2a975ad

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ cc_library_shared { 
        "libhwui",

        "libdl",

        "libstatslog",

        "server_configurable_flags",

    ],



    generated_sources: ["android_util_StatsLog.cpp"],

core/jni/AndroidRuntime.cpp

+12 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <binder/Parcel.h>

#include <utils/threads.h>

#include <cutils/properties.h>

#include <server_configurable_flags/get_flags.h>



#include <SkGraphics.h>
@@ -774,7 +775,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
      addOption("-XX:LowMemoryMode");

    }



    std::string gc_type_override =

            server_configurable_flags::GetServerConfigurableFlag("runtime_native", "gctype", "");

    std::string gc_type_override_temp;

    if (gc_type_override.empty()) {

        parseRuntimeOption("dalvik.vm.gctype", gctypeOptsBuf, "-Xgc:");

    } else {

        // Copy the string so it doesn't go out of scope since addOption does not make a copy.

        gc_type_override_temp = "-Xgc:" + gc_type_override;

        addOption(gc_type_override_temp.c_str());

    }



    parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");



    /*