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

Commit 83624df7 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Query the enable_apex_image flag from native experiment." am: ed748143 am: 32498c5c 

am: d63481be

Change-Id: Ib41e65bd247e2b5c620b72ca024aab868f8f6ea6
parents 5412ada5 d63481be

core/jni/AndroidRuntime.cpp

+16 −2
Original line number Diff line number Diff line
@@ -244,6 +244,11 @@ static const char* kGenerationalCCRuntimeOption = "-Xgc:generational_cc"; 
// Copying (CC) garbage collector.

static const char* kNoGenerationalCCRuntimeOption = "-Xgc:nogenerational_cc";



// Feature flag name for running the JIT in Zygote experiment, b/119800099.

static const char* ENABLE_APEX_IMAGE = "enable_apex_image";

// Flag to pass to the runtime when using the apex image.

static const char* kApexImageOption = "-Ximage:/system/framework/apex.art";



static AndroidRuntime* gCurRuntime = NULL;



/*
@@ -678,8 +683,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];



    if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {

        ALOGI("Boot image: '%s'\n", bootImageBuf);

    std::string use_apex_image =

        server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE,

                                                             ENABLE_APEX_IMAGE,

                                                             /*default_value=*/ "");

    if (use_apex_image == "true") {

        addOption(kApexImageOption);

        ALOGI("Using Apex boot image: '%s'\n", kApexImageOption);

    } else if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {

        ALOGI("Using dalvik.vm.boot-image: '%s'\n", bootImageBuf);

    } else {

        ALOGI("Using default boot image");

    }



    bool checkJni = false;