am 005b7828: am ad7a10cd: am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev

* commit '005b7828ee122eeb65e87f12e28a283a2809a586':
  Make native bridge property read-only.
This commit is contained in:
Calin Juravle
2014-08-26 19:39:48 +00:00
committed by Android Git Automerger

View File

@@ -881,7 +881,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();