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

Commit 02c7f958 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 

* commit '7b7d111b':
  Only pass -Xprofile-* options to ART
parents 17484411 7b7d111b

core/jni/AndroidRuntime.cpp

+4 −3
Original line number Diff line number Diff line
@@ -750,10 +750,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        mOptions.add(opt);

    }



    // libart tolerates libdvm flags, but not vice versa, so only pass these if libart.

    // libart tolerates libdvm flags, but not vice versa, so only pass some options if libart.

    property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so");

    if (strncmp(dalvikVmLibBuf, "libart", 6) == 0) {

    bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);



    if (libart) {

        // Extra options for DexClassLoader.

        property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, "");

        parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option");
@@ -784,7 +785,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    /*

     * Set profiler options

     */

    {

    if (libart) {

      char period[sizeof("-Xprofile-period:") + PROPERTY_VALUE_MAX];

      char duration[sizeof("-Xprofile-duration:") + PROPERTY_VALUE_MAX];

      char interval[sizeof("-Xprofile-interval:") + PROPERTY_VALUE_MAX];