diff options
| author | Calin Juravle <calin@google.com> | 2014-08-07 14:45:53 +0100 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2014-08-08 18:45:19 +0100 |
| commit | 2f4cf2cfd1125abfe928d6137f3d1553b0888f61 (patch) | |
| tree | 1a82c257be3e6401b714a2147e784f4c63e3177a | |
| parent | 576c384ed84cfcc5658e785af79aa925155e81fa (diff) | |
| download | base-2f4cf2cfd1125abfe928d6137f3d1553b0888f61.tar.gz | |
Pass the name of the native bridge library to the runtime
Bug: 16843953
Change-Id: Ia0f57a9b3e30a74fe4e93eb4453f841c1ef512eb
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index ea3cbee26c0d..98ea9a2d0321 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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(); |