tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "apex_libc_malloc"

Browse source 
am: c345d87aab

Change-Id: I431000eea4b8c5424f58d7c753d186619a71e8b8
This commit is contained in:
Jiyong Park 2019-04-11 07:26:00 -07:00 committed by android-build-merger
commit 7e50abf7ee
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libc/bionic/malloc_common_dynamic.cpp
View file

@ -279,10 +279,17 @@ bool InitSharedLibrary(void* impl_handle, const char* shared_lib, const char* pr
return true; return true;
} }
// Note about USE_SCUDO. This file is compiled into libc.so and libc_scudo.so.
// When compiled into libc_scudo.so, the libc_malloc_* libraries don't need
// to be loaded from the runtime namespace since libc_scudo.so is not from
// the runtime APEX, but is copied to any APEX that needs it.
#ifndef USE_SCUDO
extern "C" struct android_namespace_t* android_get_exported_namespace(const char* name); extern "C" struct android_namespace_t* android_get_exported_namespace(const char* name);
#endif
void* LoadSharedLibrary(const char* shared_lib, const char* prefix, MallocDispatch* dispatch_table) { void* LoadSharedLibrary(const char* shared_lib, const char* prefix, MallocDispatch* dispatch_table) {
void* impl_handle = nullptr; void* impl_handle = nullptr;
#ifndef USE_SCUDO
// Try to load the libc_malloc_* libs from the "runtime" namespace and then // Try to load the libc_malloc_* libs from the "runtime" namespace and then
// fall back to dlopen() to load them from the default namespace. // fall back to dlopen() to load them from the default namespace.
// //
@ -301,6 +308,7 @@ void* LoadSharedLibrary(const char* shared_lib, const char* prefix, MallocDispat
}; };
impl_handle = android_dlopen_ext(shared_lib, RTLD_NOW | RTLD_LOCAL, &dlextinfo); impl_handle = android_dlopen_ext(shared_lib, RTLD_NOW | RTLD_LOCAL, &dlextinfo);
} }
#endif
if (impl_handle == nullptr) { if (impl_handle == nullptr) {
impl_handle = dlopen(shared_lib, RTLD_NOW | RTLD_LOCAL); impl_handle = dlopen(shared_lib, RTLD_NOW | RTLD_LOCAL);