Remove a dependency on AndroidConfig.h.
Change-Id: I3fad347d49eb51f7a0f6d0ba9223d096a23f74a0
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index abd2553..07e2ec0 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -973,10 +973,9 @@
// Most JNI libraries can just use System.loadLibrary, but libcore can't because it's
// the library that implements System.loadLibrary!
{
- std::string mapped_name(StringPrintf(OS_SHARED_LIB_FORMAT_STR, "javacore"));
std::string reason;
- if (!java_vm_->LoadNativeLibrary(env, mapped_name, nullptr, &reason)) {
- LOG(FATAL) << "LoadNativeLibrary failed for \"" << mapped_name << "\": " << reason;
+ if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, &reason)) {
+ LOG(FATAL) << "LoadNativeLibrary failed for \"libjavacore.so\": " << reason;
}
}