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

Commit 3d274434 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Pass the name of the native bridge library to the runtime"

parents 7f935726 2f4cf2cf

core/jni/AndroidRuntime.cpp

+3 −0
Original line number Diff line number Diff line
@@ -584,6 +584,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, "");
@@ -876,6 +877,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();