summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2014-08-27 13:19:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-08-27 13:19:20 +0000
commit9b5112c36b5163925cb303c0cd016bf4115c5800 (patch)
tree3440df3ea1658fb2e55c65a6187579cef47bc4e2
parent007848ad8ef59385cf8dab7081c427911554c457 (diff)
parent53db6ae7819177abb9df156b269726a69a8c72df (diff)
Merge "Make native bridge property read-only."
-rw-r--r--core/jni/AndroidRuntime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 274d1a2c279e..096d4cdc2518 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -877,7 +877,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
"-Xprofile-max-stack-depth:");
}
- parseRuntimeOption("dalvik.vm.native.bridge", nativeBridgeLibrary, "-XX:NativeBridge=");
+ parseRuntimeOption("ro.dalvik.vm.native.bridge", nativeBridgeLibrary, "-XX:NativeBridge=");
initArgs.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray();