commit 01db916970ece2382ebf9e06873a14aee9543a9d
author Calin Juravle <calin@google.com> Thu Aug 07 14:45:53 2014 +0100
committer Calin Juravle <calin@google.com> Mon Aug 11 11:37:17 2014 +0100
tree 0850cab34e541f30894e89df669475b63ce196ad
parent 6d73986305bf88038c1010bd7a312a8360b1df90

Pass the name of the native bridge library to the runtime

Bug: 16843953

(cherry picked from commit 2f4cf2cfd1125abfe928d6137f3d1553b0888f61)

Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index c4c4362..90c66d7 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -590,6 +590,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, "");
@@ -882,6 +883,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();