Chromium Code Reviews| Index: webrtc/logging/BUILD.gn |
| diff --git a/webrtc/logging/BUILD.gn b/webrtc/logging/BUILD.gn |
| index 52d421e426e81f04faf822bbd54ad26c1826e225..bd8cbbfdf4658c0c4c708469237b06ecffb639bf 100644 |
| --- a/webrtc/logging/BUILD.gn |
| +++ b/webrtc/logging/BUILD.gn |
| @@ -23,9 +23,20 @@ group("logging") { |
| } |
| rtc_source_set("rtc_event_log_api") { |
| + # TODO(kjellander): Remove (bugs.webrtc.org/6828) |
| + # Enabling GN check triggers cyclic dependency error: |
| + # //webrtc/logging:rtc_event_log_api -> |
| + # //webrtc/modules/audio_coding:audio_network_adaptor -> |
| + # //webrtc/logging:rtc_event_log_api |
| + check_includes = false |
|
terelius
2017/02/27 17:26:16
I don't think this should be needed. I've filed a
kjellander_webrtc
2017/02/27 22:43:28
It is. If I remove it I have to add
//webrtc/modu
|
| sources = [ |
| "rtc_event_log/rtc_event_log.h", |
| ] |
| + deps = [ |
| + "../base:rtc_base_approved", |
| + "../call:call_interfaces", |
| + "../system_wrappers", |
|
terelius
2017/02/27 17:26:16
Why do we need system_wrappers?
kjellander_webrtc
2017/02/27 22:43:28
Good catch. It seems this particular one is not ne
|
| + ] |
| } |
| rtc_static_library("rtc_event_log_impl") { |
| @@ -41,9 +52,11 @@ rtc_static_library("rtc_event_log_impl") { |
| deps = [ |
| ":rtc_event_log_api", |
| "..:webrtc_common", |
| + "../base:rtc_base_approved", |
| "../call:call_interfaces", |
| "../modules/audio_coding:audio_network_adaptor", |
| "../modules/rtp_rtcp", |
| + "../system_wrappers", |
| ] |
| if (rtc_enable_protobuf) { |
| @@ -71,14 +84,21 @@ if (rtc_enable_protobuf) { |
| ] |
| public_deps = [ |
| + ":rtc_event_log_api", |
| ":rtc_event_log_proto", |
| "..:webrtc_common", |
| + "../call:call_interfaces", |
| + "../modules/rtp_rtcp:rtp_rtcp", |
| + "../system_wrappers", |
| ] |
| 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" ] |
| } |
| + deps = [ |
| + "../base:rtc_base_approved", |
| + ] |
| } |
| if (rtc_include_tests) { |
| @@ -92,9 +112,12 @@ if (rtc_enable_protobuf) { |
| deps = [ |
| ":rtc_event_log_impl", |
| ":rtc_event_log_parser", |
| + "../base:rtc_base_approved", |
| + "../base:rtc_base_tests_utils", |
| "../call", |
| "../modules/rtp_rtcp", |
| "../system_wrappers:metrics_default", |
| + "../test:test_support", |
| "//testing/gmock", |
| "//testing/gtest", |
| ] |
| @@ -137,6 +160,7 @@ if (rtc_enable_protobuf) { |
| ":rtc_event_log_impl", |
| ":rtc_event_log_parser", |
| "../base:rtc_base_approved", |
| + "../call:call_interfaces", |
| # TODO(kwiberg): Remove this dependency. |
| "../api/audio_codecs:audio_codecs_api", |