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

Return nullptr from FindNamespaceByClassLoader for NB-enabled apps.

Browse source 
This function is always called by the frameworks in order to
initialize vulkan layer path. For NB apps returning nullptr
disables vulkan layer library lookup as expected.

Bug: http://b/32542970
Test: mm
Change-Id: I426b2b9f5ea7227b00f063ed6040f37bb2b4f21f
This commit is contained in:
Dimitry Ivanov 2016-11-01 14:17:00 -07:00
parent 0945380e36
commit 800083d229
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnativeloader/native_loader.cpp
View file

@ -473,14 +473,14 @@ bool CloseNativeLibrary(void* handle, const bool needs_native_bridge) {
}
#if defined(__ANDROID__)
// native_bridge_namespaces are not supported for callers of this function.
// This function will return nullptr in the case when application is running
// on native bridge.
android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {
std::lock_guard<std::mutex> guard(g_namespaces_mutex);
// native_bridge_namespaces are not supported for callers of this function.
// At the moment this is libwebviewchromium_loader and vulkan.
NativeLoaderNamespace ns;
if (g_namespaces->FindNamespaceByClassLoader(env, class_loader, &ns)) {
CHECK(ns.is_android_namespace());
return ns.get_android_ns();
return ns.is_android_namespace() ? ns.get_android_ns() : nullptr;
}
return nullptr;