commit bd0eb2ca58c8edc6beaaae12fc9ee4ca64cd28bc
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 25 22:42:22 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 25 22:42:22 2019 +0000
tree 1ebf839f5c3e021114a942ac0666d6a2bf401906
parent 94c8670e6e3f7291c1e4e36f6a009d606ca86050

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

This reverts commit 94c8670e6e3f7291c1e4e36f6a009d606ca86050.

Bug: 123424163

Reason for revert: Fails boot

Change-Id: I9aa6a296275d1a2e19cb3801d9082293b2b400f0

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index feade83..a86bc94 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1752,8 +1752,7 @@
   // 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 @@
                                                 ? "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;
     }
   }