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

Commit 773c2688 authored by Calin Juravle's avatar Calin Juravle Committed by Android Git Automerger
Browse files

am 6db95fc3: am 3d274434: Merge "Pass the name of the native bridge library to the runtime" 

* commit '6db95fc3':
  Pass the name of the native bridge library to the runtime
parents 2ff92cbe 6db95fc3

core/jni/AndroidRuntime.cpp

+3 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:")-1 + PROPERTY_VALUE_MAX];

    char jitOpBuf[sizeof("-Xjitop:")-1 + PROPERTY_VALUE_MAX];

    char jitMethodBuf[sizeof("-Xjitmethod:")-1 + PROPERTY_VALUE_MAX];

    char nativeBridgeLibrary[sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX];



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");
@@ -882,6 +883,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
                           "-Xprofile-max-stack-depth:");

    }



    parseRuntimeOption("dalvik.vm.native.bridge", nativeBridgeLibrary, "-XX:NativeBridge=");



    initArgs.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();

    initArgs.nOptions = mOptions.size();