Merge "Make native bridge property read-only."

2014-08-27 13:19:18 +00:00
parent 007848ad8e 53db6ae781
commit 9b5112c36b
1 changed files with 1 additions and 1 deletions
--- 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();