author | Jan Beich <jbeich@FreeBSD.org> |
Wed, 14 Mar 2018 17:09:06 +0000 | |
changeset 414115 | 2805463648703db47072077738d485efc883f9db |
parent 414114 | f5f4f7d7fcdf6db3d6599e49b42b23dcdba3fe71 |
child 414116 | cd3905bcf1147c445895c86f0126dff86398e6a6 |
push id | 33858 |
push user | ncsoregi@mozilla.com |
push date | Tue, 17 Apr 2018 21:55:44 +0000 |
treeherder | mozilla-central@d6eb5597d744 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dminor |
bugs | 1437345 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
media/webrtc/trunk/webrtc/build/webrtc.gni | file | annotate | diff | comparison | revisions | |
media/webrtc/trunk/webrtc/modules/audio_device/BUILD.gn | file | annotate | diff | comparison | revisions |
--- a/media/webrtc/trunk/webrtc/build/webrtc.gni +++ b/media/webrtc/trunk/webrtc/build/webrtc.gni @@ -154,17 +154,17 @@ declare_args() { rtc_restrict_logging = build_with_chromium || build_with_mozilla # Excluded in Chromium since its prerequisites don't require Pulse Audio. rtc_include_pulse_audio = !build_with_chromium # Chromium uses its own IO handling, so the internal ADM is only built for # standalone WebRTC. - rtc_include_internal_audio_device = !build_with_chromium + rtc_include_internal_audio_device = !build_with_chromium && !build_with_mozilla # Include tests in standalone checkout. rtc_include_tests = !build_with_chromium && !build_with_mozilla } # Make it possible to provide custom locations for some libraries (move these # up into declare_args should we need to actually use them for the GN build). if (build_with_mozilla) {
--- a/media/webrtc/trunk/webrtc/modules/audio_device/BUILD.gn +++ b/media/webrtc/trunk/webrtc/modules/audio_device/BUILD.gn @@ -142,32 +142,30 @@ rtc_static_library("audio_device") { ] } } if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { 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", ] - libs = [ "dl" ] - if (!build_with_mozilla) { - 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", - ] - defines += [ "LINUX_ALSA" ] - libs += [ "X11" ] - } + defines += [ "LINUX_ALSA" ] + libs = [ + "dl", + "X11", + ] 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",