Revert "Revert "Load libopenjdk and libjavacore with the runtime namespace.""
This reverts commit bd0eb2ca58c8edc6beaaae12fc9ee4ca64cd28bc.
Reason for revert: Fixed ld.config files.
Change-Id: I3933faa7d6d4b981d3081e8624fa4170a4594bc6
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index a86bc94..feade83 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1752,7 +1752,8 @@
// libcore can't because it's the library that implements System.loadLibrary!
{
std::string error_msg;
- if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, nullptr, &error_msg)) {
+ if (!java_vm_->LoadNativeLibrary(
+ env, "libjavacore.so", nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
LOG(FATAL) << "LoadNativeLibrary failed for \"libjavacore.so\": " << error_msg;
}
}
@@ -1761,7 +1762,8 @@
? "libopenjdkd.so"
: "libopenjdk.so";
std::string error_msg;
- if (!java_vm_->LoadNativeLibrary(env, kOpenJdkLibrary, nullptr, nullptr, &error_msg)) {
+ if (!java_vm_->LoadNativeLibrary(
+ env, kOpenJdkLibrary, nullptr, WellKnownClasses::java_lang_Object, &error_msg)) {
LOG(FATAL) << "LoadNativeLibrary failed for \"" << kOpenJdkLibrary << "\": " << error_msg;
}
}