Chromium Code Reviews| Index: webrtc/modules/audio_coding/BUILD.gn |
| diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn |
| index 3b852d32cf5f6541208ec9bb4b97250874346e7d..9b16bc09dba0fdab31fd99e0c67efd56f6b091f1 100644 |
| --- a/webrtc/modules/audio_coding/BUILD.gn |
| +++ b/webrtc/modules/audio_coding/BUILD.gn |
| @@ -887,7 +887,8 @@ if (rtc_enable_protobuf) { |
| sources = [ |
| "audio_network_adaptor/debug_dump.proto", |
| ] |
| - proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" |
| + proto_in_dir = "//" |
| + proto_out_dir = "." |
|
terelius
2017/01/19 12:23:40
Note that this is similar to the change that (prob
minyue-webrtc
2017/01/19 12:46:13
Thanks! This should not be needed either.
|
| } |
| proto_library("ana_config_proto") { |
| sources = [ |
| @@ -914,6 +915,8 @@ rtc_static_library("audio_network_adaptor") { |
| "audio_network_adaptor/debug_dump_writer.h", |
| "audio_network_adaptor/dtx_controller.cc", |
| "audio_network_adaptor/dtx_controller.h", |
| + "audio_network_adaptor/event_log_writer.cc", |
| + "audio_network_adaptor/event_log_writer.h", |
| "audio_network_adaptor/fec_controller.cc", |
| "audio_network_adaptor/fec_controller.h", |
| "audio_network_adaptor/frame_length_controller.cc", |
| @@ -925,6 +928,7 @@ rtc_static_library("audio_network_adaptor") { |
| "../..:webrtc_common", |
| "../../base:rtc_base_approved", |
| "../../common_audio", |
| + "../../logging:rtc_event_log_api", |
| "../../system_wrappers", |
| ] |
| @@ -935,6 +939,11 @@ rtc_static_library("audio_network_adaptor") { |
| ] |
| defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ] |
| } |
| + |
| + if (!build_with_chromium && is_clang) { |
| + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| + } |
| } |
| rtc_static_library("neteq") { |