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

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

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

Merge commit '19275cb5' into froyo-plus-aosp

* commit '19275cb5':
  Remove code to pass the nonexistant lockprofsample flag to Dalvik.
parents 19fa6d45 19275cb5

core/jni/AndroidRuntime.cpp

+0 −9
Original line number Diff line number Diff line
@@ -712,15 +712,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];