Chromium Code Reviews| Index: webrtc/voice_engine/BUILD.gn |
| diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn |
| index 808d980c6f475685a9b4c10948cbf6f64d6ad301..b712066a37e174105beedbb2cb2b9d7e5a0bf152 100644 |
| --- a/webrtc/voice_engine/BUILD.gn |
| +++ b/webrtc/voice_engine/BUILD.gn |
| @@ -9,6 +9,74 @@ |
| import("../build/webrtc.gni") |
| import("//testing/test.gni") |
| +source_set("audio_coder") { |
| + sources = [ |
| + "coder.cc", |
| + "coder.h", |
| + ] |
| + configs += [ "..:common_config" ] |
| + public_configs = [ "..:common_inherited_config" ] |
| + deps = [ |
| + "../modules/audio_coding:audio_coding", |
| + "../modules/audio_coding:builtin_audio_decoder_factory", |
| + "../modules/audio_coding:rent_a_codec", |
| + "..:webrtc_common", |
| + ] |
| + |
| + if (is_clang) { |
| + # Suppress warnings from Chrome's Clang plugins. |
| + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| + configs -= [ "//build/config/clang:find_bad_constructs" ] |
| + } |
| +} |
| + |
| +source_set("file_player") { |
| + sources = [ |
| + "file_player.h", |
| + "file_player_impl.cc", |
| + "file_player_impl.h", |
| + ] |
| + configs += [ "..:common_config" ] |
| + public_configs = [ "..:common_inherited_config" ] |
| + deps = [ |
| + "../common_audio:common_audio", |
| + "../modules/media_file:media_file", |
| + "../system_wrappers:system_wrappers", |
| + "..:webrtc_common", |
| + ":audio_coder", |
| + ] |
| + |
| + if (is_clang) { |
| + # Suppress warnings from Chrome's Clang plugins. |
| + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| + configs -= [ "//build/config/clang:find_bad_constructs" ] |
|
kjellander_webrtc
2016/08/15 11:22:27
It would be great if these warnings could be fixed
kwiberg-webrtc
2016/08/15 11:26:32
This is CL ~#3 of a series of ~7 that cleans these
|
| + } |
| +} |
| + |
| +source_set("file_recorder") { |
| + sources = [ |
| + "file_recorder.h", |
| + "file_recorder_impl.cc", |
| + "file_recorder_impl.h", |
| + ] |
| + configs += [ "..:common_config" ] |
| + public_configs = [ "..:common_inherited_config" ] |
| + deps = [ |
| + "../base:rtc_base_approved", |
| + "../common_audio:common_audio", |
| + "../modules/media_file:media_file", |
| + "../system_wrappers:system_wrappers", |
| + "..:webrtc_common", |
| + ":audio_coder", |
| + ] |
| + |
| + if (is_clang) { |
| + # Suppress warnings from Chrome's Clang plugins. |
| + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| + configs -= [ "//build/config/clang:find_bad_constructs" ] |
| + } |
| +} |
| + |
| source_set("voice_engine") { |
| sources = [ |
| "channel.cc", |
| @@ -89,6 +157,8 @@ source_set("voice_engine") { |
| } |
| deps = [ |
| + ":file_player", |
| + ":file_recorder", |
| ":level_indicator", |
| "..:rtc_event_log", |
| "..:webrtc_common", |
| @@ -129,6 +199,7 @@ if (rtc_include_tests) { |
| ":voice_engine", |
| "//testing/gmock", |
| "//testing/gtest", |
| + "//third_party/gflags", |
| "//webrtc/common_audio", |
| "//webrtc/modules/audio_coding", |
| "//webrtc/modules/audio_conference_mixer", |
| @@ -143,10 +214,15 @@ if (rtc_include_tests) { |
| if (is_android) { |
| deps += [ "//testing/android/native_test:native_test_native_code" ] |
| + data = [ |
| + "//resources/utility/encapsulated_pcm16b_8khz.wav", |
| + "//resources/utility/encapsulated_pcmu_8khz.wav", |
| + ] |
| } |
| sources = [ |
| "channel_unittest.cc", |
| + "file_player_unittests.cc", |
| "network_predictor_unittest.cc", |
| "transmit_mixer_unittest.cc", |
| "utility_unittest.cc", |