generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 32b039e4: Merge "RTLD_LAZY is not supported, use RTLD_NOW instead."

Browse Source 
* commit '32b039e46eee4d40b9979eab873a957e86fbf969':
  RTLD_LAZY is not supported, use RTLD_NOW instead.
This commit is contained in:
Dmitriy Ivanov
2015-03-24 01:00:49 +00:00
committed by Android Git Automerger
parent ecf010ed41 32b039e46e
commit efaf8ff6e4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/NetdClient.cpp
View File

@@ -34,7 +34,7 @@ static void netdClientInitFunction(void* handle, const char* symbol, FunctionTyp
} }
static void netdClientInitImpl() { static void netdClientInitImpl() {
void* netdClientHandle = dlopen("libnetd_client.so", RTLD_LAZY); void* netdClientHandle = dlopen("libnetd_client.so", RTLD_NOW);
if (netdClientHandle == NULL) { if (netdClientHandle == NULL) {
// If the library is not available, it's not an error. We'll just use // If the library is not available, it's not an error. We'll just use
// default implementations of functions that it would've overridden. // default implementations of functions that it would've overridden.

2
libc/bionic/malloc_debug_common.cpp
View File

@@ -402,7 +402,7 @@ static void malloc_init_impl() {
} }
// Load .so that implements the required malloc debugging functionality. // Load .so that implements the required malloc debugging functionality.
void* malloc_impl_handle = dlopen(so_name, RTLD_LAZY); void* malloc_impl_handle = dlopen(so_name, RTLD_NOW);
if (malloc_impl_handle == NULL) { if (malloc_impl_handle == NULL) {
error_log("%s: Missing module %s required for malloc debug level %d: %s", error_log("%s: Missing module %s required for malloc debug level %d: %s",
getprogname(), so_name, g_malloc_debug_level, dlerror()); getprogname(), so_name, g_malloc_debug_level, dlerror());