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

Commit dbc108a7 authored by Carl Shapiro's avatar Carl Shapiro Committed by Android Git Automerger
Browse files

am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant... 

am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo

Merge commit '15feb4de' into kraken

* commit '15feb4de':
  Remove code to pass the nonexistant lockprofsample flag to Dalvik.
parents 20fa839d 15feb4de

core/jni/AndroidRuntime.cpp

+0 −9
Original line number Diff line number Diff line
@@ -711,15 +711,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
      mOptions.add(opt);

    }



    char lockProfSampleBuf[sizeof("-Xlockprofsample:") + sizeof(propBuf)];

    property_get("dalvik.vm.lockprof.sample", propBuf, "");

    if (strlen(propBuf) > 0) {

      strcpy(lockProfSampleBuf, "-Xlockprofsample:");

      strcat(lockProfSampleBuf, propBuf);

      opt.optionString = lockProfSampleBuf;

      mOptions.add(opt);

    }



#if defined(WITH_JIT)

    /* Minimal profile threshold to trigger JIT compilation */

    char jitThresholdBuf[sizeof("-Xjitthreshold:") + PROPERTY_VALUE_MAX];