diff --git a/src/build/common.gypi b/src/build/common.gypi index bb19e37f10..53431750ae 100644 --- a/src/build/common.gypi +++ b/src/build/common.gypi @@ -25,6 +25,13 @@ 'direct_show_base_classes': 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/', }], + ['build_with_chromium==1', { + # Exclude pulse audio on Chromium since its prerequisites don't + # include pulse audio. + 'include_pulse_audio%': 0, + }, { + 'include_pulse_audio%': 1, + }], ], # conditions }, 'target_defaults': { diff --git a/src/modules/audio_device/main/source/audio_device.gyp b/src/modules/audio_device/main/source/audio_device.gyp index 1570b425b6..519dcfc73b 100644 --- a/src/modules/audio_device/main/source/audio_device.gyp +++ b/src/modules/audio_device/main/source/audio_device.gyp @@ -52,18 +52,12 @@ 'Linux/alsasymboltable.h', 'Linux/audio_device_linux_alsa.cc', 'Linux/audio_device_linux_alsa.h', - 'Linux/audio_device_linux_pulse.cc', - 'Linux/audio_device_linux_pulse.h', 'Linux/audio_device_utility_linux.cc', 'Linux/audio_device_utility_linux.h', 'Linux/audio_mixer_manager_linux_alsa.cc', 'Linux/audio_mixer_manager_linux_alsa.h', - 'Linux/audio_mixer_manager_linux_pulse.cc', - 'Linux/audio_mixer_manager_linux_pulse.h', 'Linux/latebindingsymboltable.cc', 'Linux/latebindingsymboltable.h', - 'Linux/pulseaudiosymboltable.cc', - 'Linux/pulseaudiosymboltable.h', 'Mac/audio_device_mac.cc', 'Mac/audio_device_mac.h', 'Mac/audio_device_utility_mac.cc', @@ -89,16 +83,10 @@ 'Linux/alsasymboltable.h', 'Linux/audio_device_linux_alsa.cc', 'Linux/audio_device_linux_alsa.h', - 'Linux/audio_device_linux_pulse.cc', - 'Linux/audio_device_linux_pulse.h', 'Linux/audio_mixer_manager_linux_alsa.cc', 'Linux/audio_mixer_manager_linux_alsa.h', - 'Linux/audio_mixer_manager_linux_pulse.cc', - 'Linux/audio_mixer_manager_linux_pulse.h', 'Linux/latebindingsymboltable.cc', 'Linux/latebindingsymboltable.h', - 'Linux/pulseaudiosymboltable.cc', - 'Linux/pulseaudiosymboltable.h', # Don't remove these, needed for dummy device # 'Linux/audio_device_utility_linux.cc', # 'Linux/audio_device_utility_linux.h', @@ -131,7 +119,6 @@ }], ['OS=="linux"', { 'defines': [ - 'LINUX_PULSE', 'LINUX_ALSA', ], 'include_dirs': [ @@ -141,9 +128,28 @@ 'libraries': [ '-ldl', '-lasound', - '-lpulse', ], }, + 'conditions': [ + ['include_pulse_audio==1', { + 'defines': [ + 'LINUX_PULSE', + ], + 'sources': [ + 'Linux/audio_device_linux_pulse.cc', + 'Linux/audio_device_linux_pulse.h', + 'Linux/audio_mixer_manager_linux_pulse.cc', + 'Linux/audio_mixer_manager_linux_pulse.h', + 'Linux/pulseaudiosymboltable.cc', + 'Linux/pulseaudiosymboltable.h', + ], + 'link_settings': { + 'libraries': [ + '-lpulse', + ], + }, + }], + ], }], ['OS=="mac"', { 'include_dirs': [