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

Commit 5af7ce8d authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add gctype device config property for GC experiments" 

am: e24b30b7

Change-Id: I5c78c553e1bd1fe610e797c5f6ca4cc1a711721c
parents 2b8063d7 e24b30b7

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,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>
@@ -769,7 +770,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=");



    /*