From 53056722fbbba44bb30e125b4a0be37e6bb878e7 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Mon, 23 Mar 2015 13:38:20 -0700 Subject: RTLD_LAZY is not supported, use RTLD_NOW instead. Change-Id: I5f4da01778a0df90bf104d868a00f86445d93a2d --- runtime/java_vm_ext.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/java_vm_ext.cc') diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 13f3573919..09bfbf3885 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -631,20 +631,20 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject Locks::mutator_lock_->AssertNotHeld(self); const char* path_str = path.empty() ? nullptr : path.c_str(); - void* handle = dlopen(path_str, RTLD_LAZY); + void* handle = dlopen(path_str, RTLD_NOW); bool needs_native_bridge = false; if (handle == nullptr) { if (android::NativeBridgeIsSupported(path_str)) { - handle = android::NativeBridgeLoadLibrary(path_str, RTLD_LAZY); + handle = android::NativeBridgeLoadLibrary(path_str, RTLD_NOW); needs_native_bridge = true; } } - VLOG(jni) << "[Call to dlopen(\"" << path << "\", RTLD_LAZY) returned " << handle << "]"; + VLOG(jni) << "[Call to dlopen(\"" << path << "\", RTLD_NOW) returned " << handle << "]"; if (handle == nullptr) { *error_msg = dlerror(); - VLOG(jni) << "dlopen(\"" << path << "\", RTLD_LAZY) failed: " << *error_msg; + VLOG(jni) << "dlopen(\"" << path << "\", RTLD_NOW) failed: " << *error_msg; return false; } -- cgit v1.2.3-59-g8ed1b