Merge changes I59024a0a,Iafd12e5a am: 19377a55c5

Change-Id: I11e0c744eade40f2c270e9241863e94ec22f84a0
This commit is contained in:
Ryan Prichard 2020-04-21 23:18:39 +00:00 committed by Automerger Merge Worker
commit 8baf87c79a

View file

@ -279,10 +279,12 @@ bool __loader_android_link_namespaces_all_libs(android_namespace_t* namespace_fr
}
android_namespace_t* __loader_android_get_exported_namespace(const char* name) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
return get_exported_namespace(name);
}
void __loader_cfi_fail(uint64_t CallSiteTypeId, void* Ptr, void *DiagData, void *CallerPc) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
CFIShadowWriter::CfiFail(CallSiteTypeId, Ptr, DiagData, CallerPc);
}