diff options
| author | Calin Juravle <calin@google.com> | 2014-08-08 17:47:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-07 18:51:06 +0000 |
| commit | 3d274434c78856388484a722da2887ca846907ee (patch) | |
| tree | 70a1750af1f7e840d1b90e0e54ffc281305b00fe | |
| parent | 7f93572650d939a416588a17baab87906d310c40 (diff) | |
| parent | 2f4cf2cfd1125abfe928d6137f3d1553b0888f61 (diff) | |
| download | base-3d274434c78856388484a722da2887ca846907ee.tar.gz | |
Merge "Pass the name of the native bridge library to the runtime"
| -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(); |