Commit 1bbbd151 authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Don't manually load libpulsecommon-11.1.so on Linux

On Trusty, the file is called libpulsecommon-4.0.so.  On gLinux (debian testing),
the file is libpulsecommon-12.2.so.  This causes some log spam due to not being
able to find the file.

However, the library does get loaded indirectly by libpulse.so.0 (which is also
in the list of libraries loaded by LoadAudioLibraries()):

$ ldd libpulse.so.0 | grep libpulsecommon
	libpulsecommon-12.2.so => /usr/lib/x86_64-linux-gnu/pulseaudio/libpulsecommon-12.2.so

So the solution is to simply remove libpulsecommon-11.1.so from the list.

BUG=None
R=miu,marinaciocea

Change-Id: Idefca3b7f25b1875188ffd4f300f0f9ff9ec6c7d
Reviewed-on: https://chromium-review.googlesource.com/c/1352815Reviewed-by: default avatarMarina Ciocea <marinaciocea@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611735}
parent 163bcd6c
...@@ -103,7 +103,7 @@ std::vector<BrokerFilePermission> GetAudioFilePermissions() { ...@@ -103,7 +103,7 @@ std::vector<BrokerFilePermission> GetAudioFilePermissions() {
void LoadAudioLibraries() { void LoadAudioLibraries() {
const std::string kLibraries[]{"libasound.so.2", "libpulse.so.0", const std::string kLibraries[]{"libasound.so.2", "libpulse.so.0",
"libpulsecommon-11.1.so", "libnss_files.so.2"}; "libnss_files.so.2"};
for (const auto& library_name : kLibraries) { for (const auto& library_name : kLibraries) {
if (nullptr == if (nullptr ==
dlopen(library_name.c_str(), RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) { dlopen(library_name.c_str(), RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment