| Index: webrtc/modules/audio_device/BUILD.gn
|
| diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
|
| index 35a99eaac7e6cae274ddb9607b6d17cc175eaa7e..407f4ccfaaa4b6c7cca415992aec0a59ed937494 100644
|
| --- a/webrtc/modules/audio_device/BUILD.gn
|
| +++ b/webrtc/modules/audio_device/BUILD.gn
|
| @@ -94,97 +94,101 @@ source_set("audio_device") {
|
| "OpenSLES",
|
| ]
|
| }
|
| - if (is_linux) {
|
| - sources += [
|
| - "linux/alsasymboltable_linux.cc",
|
| - "linux/alsasymboltable_linux.h",
|
| - "linux/audio_device_alsa_linux.cc",
|
| - "linux/audio_device_alsa_linux.h",
|
| - "linux/audio_mixer_manager_alsa_linux.cc",
|
| - "linux/audio_mixer_manager_alsa_linux.h",
|
| - "linux/latebindingsymboltable_linux.cc",
|
| - "linux/latebindingsymboltable_linux.h",
|
| - ]
|
| - defines += [ "LINUX_ALSA" ]
|
| - libs = [
|
| - "dl",
|
| - "X11",
|
| - ]
|
| - if (rtc_include_pulse_audio) {
|
| + if (rtc_use_dummy_audio_file_devices) {
|
| + defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
|
| + } else {
|
| + if (is_linux) {
|
| sources += [
|
| - "linux/audio_device_pulse_linux.cc",
|
| - "linux/audio_device_pulse_linux.h",
|
| - "linux/audio_mixer_manager_pulse_linux.cc",
|
| - "linux/audio_mixer_manager_pulse_linux.h",
|
| - "linux/pulseaudiosymboltable_linux.cc",
|
| - "linux/pulseaudiosymboltable_linux.h",
|
| + "linux/alsasymboltable_linux.cc",
|
| + "linux/alsasymboltable_linux.h",
|
| + "linux/audio_device_alsa_linux.cc",
|
| + "linux/audio_device_alsa_linux.h",
|
| + "linux/audio_mixer_manager_alsa_linux.cc",
|
| + "linux/audio_mixer_manager_alsa_linux.h",
|
| + "linux/latebindingsymboltable_linux.cc",
|
| + "linux/latebindingsymboltable_linux.h",
|
| + ]
|
| + defines += [ "LINUX_ALSA" ]
|
| + libs = [
|
| + "dl",
|
| + "X11",
|
| ]
|
| - defines += [ "LINUX_PULSE" ]
|
| + if (rtc_include_pulse_audio) {
|
| + sources += [
|
| + "linux/audio_device_pulse_linux.cc",
|
| + "linux/audio_device_pulse_linux.h",
|
| + "linux/audio_mixer_manager_pulse_linux.cc",
|
| + "linux/audio_mixer_manager_pulse_linux.h",
|
| + "linux/pulseaudiosymboltable_linux.cc",
|
| + "linux/pulseaudiosymboltable_linux.h",
|
| + ]
|
| + defines += [ "LINUX_PULSE" ]
|
| + }
|
| }
|
| - }
|
| - if (is_mac) {
|
| - sources += [
|
| - "mac/audio_device_mac.cc",
|
| - "mac/audio_device_mac.h",
|
| - "mac/audio_mixer_manager_mac.cc",
|
| - "mac/audio_mixer_manager_mac.h",
|
| - "mac/portaudio/pa_memorybarrier.h",
|
| - "mac/portaudio/pa_ringbuffer.c",
|
| - "mac/portaudio/pa_ringbuffer.h",
|
| - ]
|
| - libs = [
|
| - "AudioToolbox.framework",
|
| - "CoreAudio.framework",
|
| + if (is_mac) {
|
| + sources += [
|
| + "mac/audio_device_mac.cc",
|
| + "mac/audio_device_mac.h",
|
| + "mac/audio_mixer_manager_mac.cc",
|
| + "mac/audio_mixer_manager_mac.h",
|
| + "mac/portaudio/pa_memorybarrier.h",
|
| + "mac/portaudio/pa_ringbuffer.c",
|
| + "mac/portaudio/pa_ringbuffer.h",
|
| + ]
|
| + libs = [
|
| + "AudioToolbox.framework",
|
| + "CoreAudio.framework",
|
|
|
| - # Needed for CGEventSourceKeyState in audio_device_mac.cc:
|
| - "CoreGraphics.framework",
|
| - ]
|
| - }
|
| - if (is_ios) {
|
| - public_deps = [
|
| - "../../sdk:rtc_sdk_common_objc",
|
| - ]
|
| - sources += [
|
| - "ios/audio_device_ios.h",
|
| - "ios/audio_device_ios.mm",
|
| - "ios/audio_device_not_implemented_ios.mm",
|
| - "ios/audio_session_observer.h",
|
| - "ios/objc/RTCAudioSession+Configuration.mm",
|
| - "ios/objc/RTCAudioSession+Private.h",
|
| - "ios/objc/RTCAudioSession.h",
|
| - "ios/objc/RTCAudioSession.mm",
|
| - "ios/objc/RTCAudioSessionConfiguration.h",
|
| - "ios/objc/RTCAudioSessionConfiguration.m",
|
| - "ios/objc/RTCAudioSessionDelegateAdapter.h",
|
| - "ios/objc/RTCAudioSessionDelegateAdapter.mm",
|
| - "ios/voice_processing_audio_unit.h",
|
| - "ios/voice_processing_audio_unit.mm",
|
| - ]
|
| - configs += [ "//build/config/compiler:enable_arc" ]
|
| + # Needed for CGEventSourceKeyState in audio_device_mac.cc:
|
| + "CoreGraphics.framework",
|
| + ]
|
| + }
|
| + if (is_ios) {
|
| + public_deps = [
|
| + "../../sdk:rtc_sdk_common_objc",
|
| + ]
|
| + sources += [
|
| + "ios/audio_device_ios.h",
|
| + "ios/audio_device_ios.mm",
|
| + "ios/audio_device_not_implemented_ios.mm",
|
| + "ios/audio_session_observer.h",
|
| + "ios/objc/RTCAudioSession+Configuration.mm",
|
| + "ios/objc/RTCAudioSession+Private.h",
|
| + "ios/objc/RTCAudioSession.h",
|
| + "ios/objc/RTCAudioSession.mm",
|
| + "ios/objc/RTCAudioSessionConfiguration.h",
|
| + "ios/objc/RTCAudioSessionConfiguration.m",
|
| + "ios/objc/RTCAudioSessionDelegateAdapter.h",
|
| + "ios/objc/RTCAudioSessionDelegateAdapter.mm",
|
| + "ios/voice_processing_audio_unit.h",
|
| + "ios/voice_processing_audio_unit.mm",
|
| + ]
|
| + configs += [ "//build/config/compiler:enable_arc" ]
|
|
|
| - libs = [
|
| - "AudioToolbox.framework",
|
| - "AVFoundation.framework",
|
| - "Foundation.framework",
|
| - "UIKit.framework",
|
| - ]
|
| - }
|
| - if (is_win) {
|
| - sources += [
|
| - "win/audio_device_core_win.cc",
|
| - "win/audio_device_core_win.h",
|
| - "win/audio_device_wave_win.cc",
|
| - "win/audio_device_wave_win.h",
|
| - "win/audio_mixer_manager_win.cc",
|
| - "win/audio_mixer_manager_win.h",
|
| - ]
|
| - libs = [
|
| - # Required for the built-in WASAPI AEC.
|
| - "dmoguids.lib",
|
| - "wmcodecdspuuid.lib",
|
| - "amstrmid.lib",
|
| - "msdmo.lib",
|
| - ]
|
| + libs = [
|
| + "AudioToolbox.framework",
|
| + "AVFoundation.framework",
|
| + "Foundation.framework",
|
| + "UIKit.framework",
|
| + ]
|
| + }
|
| + if (is_win) {
|
| + sources += [
|
| + "win/audio_device_core_win.cc",
|
| + "win/audio_device_core_win.h",
|
| + "win/audio_device_wave_win.cc",
|
| + "win/audio_device_wave_win.h",
|
| + "win/audio_mixer_manager_win.cc",
|
| + "win/audio_mixer_manager_win.h",
|
| + ]
|
| + libs = [
|
| + # Required for the built-in WASAPI AEC.
|
| + "dmoguids.lib",
|
| + "wmcodecdspuuid.lib",
|
| + "amstrmid.lib",
|
| + "msdmo.lib",
|
| + ]
|
| + }
|
| }
|
| } else {
|
| defines = [ "WEBRTC_DUMMY_AUDIO_BUILD" ]
|
|
|