Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2671)

Unified Diff: device/udev_linux/udev0_loader.cc

Issue 755873003: MemorySanitizer: improve the udev dynamic loading hack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: todo ownership Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | device/udev_linux/udev_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/udev_linux/udev0_loader.cc
diff --git a/device/udev_linux/udev0_loader.cc b/device/udev_linux/udev0_loader.cc
index d70b2f26cfbc16687a4ede02031d6af063222bb9..9faab97bc1296e5f981ac9a74a97882e3ea2ce5f 100644
--- a/device/udev_linux/udev0_loader.cc
+++ b/device/udev_linux/udev0_loader.cc
@@ -18,7 +18,14 @@ bool Udev0Loader::Init() {
if (lib_loader_)
return lib_loader_->loaded();
lib_loader_.reset(new LibUdev0Loader);
+#if defined(MEMORY_SANITIZER)
+ // Temporary hack: rely on the symlink to pick up whichever *instrumented*
+ // version of libudev we have, be it libudev0 or libudev1. crbug.com/437464
+ // TODO(earthdok): Remove this hack after upgrading our LKGR builders.
+ return lib_loader_->Load("libudev.so");
+#else
return lib_loader_->Load("libudev.so.0");
+#endif
}
const char* Udev0Loader::udev_device_get_action(udev_device* udev_device) {
« no previous file with comments | « no previous file | device/udev_linux/udev_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698