commit 3d274434c78856388484a722da2887ca846907ee
author Calin Juravle <calin@google.com> Fri Aug 08 17:47:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 07 18:51:06 2014 +0000
tree 70a1750af1f7e840d1b90e0e54ffc281305b00fe
parent 7f93572650d939a416588a17baab87906d310c40
parent 2f4cf2cfd1125abfe928d6137f3d1553b0888f61

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

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index ea3cbee..98ea9a2 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -584,6 +584,7 @@
     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 @@
                            "-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();