diff options
| author | earthdok <earthdok@chromium.org> | 2014-12-16 11:15:12 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-16 19:15:59 +0000 |
| commit | f739afc03d8efeda8f17a8d6273ddc34bafb685a (patch) | |
| tree | 15beec150bba2e6f9ab12909e441acf0892035e0 /device/udev_linux | |
| parent | 70f384aa879dcdf84ce9fd108bf26080b0cb2737 (diff) | |
| download | chromium_src-f739afc03d8efeda8f17a8d6273ddc34bafb685a.zip chromium_src-f739afc03d8efeda8f17a8d6273ddc34bafb685a.tar.gz chromium_src-f739afc03d8efeda8f17a8d6273ddc34bafb685a.tar.bz2 | |
No longer do the libudev loading hack in MSan builds.
Our LKGR builders have been upgraded to Trusty, so we no longer need this.
BUG=438427
TBR=reillyg@chromium.org
Review URL: https://codereview.chromium.org/807203002
Cr-Commit-Position: refs/heads/master@{#308627}
Diffstat (limited to 'device/udev_linux')
| -rw-r--r-- | device/udev_linux/udev0_loader.cc | 7 | ||||
| -rw-r--r-- | device/udev_linux/udev_loader.cc | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/device/udev_linux/udev0_loader.cc b/device/udev_linux/udev0_loader.cc index 9faab97..d70b2f2 100644 --- a/device/udev_linux/udev0_loader.cc +++ b/device/udev_linux/udev0_loader.cc @@ -18,14 +18,7 @@ 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) { diff --git a/device/udev_linux/udev_loader.cc b/device/udev_linux/udev_loader.cc index 1a5823c..88b64e1 100644 --- a/device/udev_linux/udev_loader.cc +++ b/device/udev_linux/udev_loader.cc @@ -22,19 +22,11 @@ UdevLoader* UdevLoader::Get() { return g_udev_loader; scoped_ptr<UdevLoader> udev_loader; - // This is an ugly hack to get around the fact that a MSAN build on Precise - // will only build an instrumented copy of libudev0 and not libudev1. If one - // runs the binary on Trusty, it will end up loading an uninstrumented - // libudev1 at run time. http://crbug.com/437464 - // TODO(earthdok): Remove this after upgrading our MSAN LKGR builders to - // Trusty. -#if !defined(MEMORY_SANITIZER) udev_loader.reset(new Udev1Loader); if (udev_loader->Init()) { g_udev_loader = udev_loader.release(); return g_udev_loader; } -#endif udev_loader.reset(new Udev0Loader); if (udev_loader->Init()) { |