Revert "Load libopenjdk and libjavacore with the runtime namespace."

This reverts commit 94c8670e6e3f7291c1e4e36f6a009d606ca86050.

Bug: 123424163

Reason for revert: Fails boot

Change-Id: I9aa6a296275d1a2e19cb3801d9082293b2b400f0

1 files changed, 2 insertions, 4 deletions

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index feade83a2e..a86bc9438e 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1752,8 +1752,7 @@ void Runtime::InitNativeMethods() {
   // libcore can't because it's the library that implements System.loadLibrary!
   {
     std::string error_msg;
-    if (!java_vm_->LoadNativeLibrary(
-          env, "libjavacore.so", nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
+    if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, nullptr, &error_msg)) {
       LOG(FATAL) << "LoadNativeLibrary failed for \"libjavacore.so\": " << error_msg;
     }
   }
@@ -1762,8 +1761,7 @@ void Runtime::InitNativeMethods() {
                                                 ? "libopenjdkd.so"
                                                 : "libopenjdk.so";
     std::string error_msg;
-    if (!java_vm_->LoadNativeLibrary(
-          env, kOpenJdkLibrary, nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
+    if (!java_vm_->LoadNativeLibrary(env, kOpenJdkLibrary, nullptr, nullptr, &error_msg)) {
       LOG(FATAL) << "LoadNativeLibrary failed for \"" << kOpenJdkLibrary << "\": " << error_msg;
     }
   }