Skip to content

Commit 01db916

Browse files
author
Calin Juravle
committed
Pass the name of the native bridge library to the runtime
Bug: 16843953 (cherry picked from commit 2f4cf2c) Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
1 parent 6d73986 commit 01db916

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

core/jni/AndroidRuntime.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
590590
char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:")-1 + PROPERTY_VALUE_MAX];
591591
char jitOpBuf[sizeof("-Xjitop:")-1 + PROPERTY_VALUE_MAX];
592592
char jitMethodBuf[sizeof("-Xjitmethod:")-1 + PROPERTY_VALUE_MAX];
593+
char nativeBridgeLibrary[sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX];
593594

594595
bool checkJni = false;
595596
property_get("dalvik.vm.checkjni", propBuf, "");
@@ -882,6 +883,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
882883
"-Xprofile-max-stack-depth:");
883884
}
884885

886+
parseRuntimeOption("dalvik.vm.native.bridge", nativeBridgeLibrary, "-XX:NativeBridge=");
887+
885888
initArgs.version = JNI_VERSION_1_4;
886889
initArgs.options = mOptions.editArray();
887890
initArgs.nOptions = mOptions.size();

0 commit comments

Comments
 (0)