From 01db916970ece2382ebf9e06873a14aee9543a9d Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Thu, 7 Aug 2014 14:45:53 +0100 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index c4c4362fd70a..90c66d7f2a00 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -590,6 +590,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, ""); @@ -882,6 +883,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(); -- cgit v1.2.3-59-g8ed1b