Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 import("../webrtc.gni") | 9 import("../webrtc.gni") |
| 10 import("//third_party/protobuf/proto_library.gni") | 10 import("//third_party/protobuf/proto_library.gni") |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 public_deps += [ ":rtc_event_log_parser" ] | 21 public_deps += [ ":rtc_event_log_parser" ] |
| 22 } | 22 } |
| 23 } | 23 } |
| 24 | 24 |
| 25 rtc_source_set("rtc_event_log_api") { | 25 rtc_source_set("rtc_event_log_api") { |
| 26 # TODO(kjellander): Remove (bugs.webrtc.org/7257) | 26 # TODO(kjellander): Remove (bugs.webrtc.org/7257) |
| 27 # Enabling GN check triggers cyclic dependency error: | 27 # Enabling GN check triggers cyclic dependency error: |
| 28 # //webrtc/logging:rtc_event_log_api -> | 28 # //webrtc/logging:rtc_event_log_api -> |
| 29 # //webrtc/modules/audio_coding:audio_network_adaptor -> | 29 # //webrtc/modules/audio_coding:audio_network_adaptor -> |
| 30 # //webrtc/logging:rtc_event_log_api | 30 # //webrtc/logging:rtc_event_log_api |
| 31 check_includes = false | 31 check_includes = false |
|
kjellander_webrtc
2017/04/06 08:41:38
Does this mean that this can be removed now?
Try
michaelt
2017/04/06 09:16:37
When I activate the check some unrelated problems
| |
| 32 sources = [ | 32 sources = [ |
| 33 "rtc_event_log/rtc_event_log.h", | 33 "rtc_event_log/rtc_event_log.h", |
| 34 ] | 34 ] |
| 35 deps = [ | 35 deps = [ |
| 36 "../base:rtc_base_approved", | 36 "../base:rtc_base_approved", |
| 37 "../call:call_interfaces", | 37 "../call:call_interfaces", |
| 38 ] | 38 ] |
| 39 } | 39 } |
| 40 | 40 |
| 41 rtc_static_library("rtc_event_log_impl") { | 41 rtc_static_library("rtc_event_log_impl") { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 sources = [ | 80 sources = [ |
| 81 "rtc_event_log/rtc_event_log_parser.cc", | 81 "rtc_event_log/rtc_event_log_parser.cc", |
| 82 "rtc_event_log/rtc_event_log_parser.h", | 82 "rtc_event_log/rtc_event_log_parser.h", |
| 83 ] | 83 ] |
| 84 | 84 |
| 85 public_deps = [ | 85 public_deps = [ |
| 86 ":rtc_event_log_api", | 86 ":rtc_event_log_api", |
| 87 ":rtc_event_log_proto", | 87 ":rtc_event_log_proto", |
| 88 "..:webrtc_common", | 88 "..:webrtc_common", |
| 89 "../call:call_interfaces", | 89 "../call:call_interfaces", |
| 90 "../modules/audio_coding:audio_network_adaptor", | |
| 90 "../modules/rtp_rtcp:rtp_rtcp", | 91 "../modules/rtp_rtcp:rtp_rtcp", |
| 91 "../system_wrappers", | 92 "../system_wrappers", |
| 92 ] | 93 ] |
| 93 | 94 |
| 94 if (!build_with_chromium && is_clang) { | 95 if (!build_with_chromium && is_clang) { |
| 95 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 96 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 96 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 97 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 97 } | 98 } |
| 98 deps = [ | 99 deps = [ |
| 99 "../base:rtc_base_approved", | 100 "../base:rtc_base_approved", |
| 100 ] | 101 ] |
| 101 } | 102 } |
| 102 | 103 |
| 103 if (rtc_include_tests) { | 104 if (rtc_include_tests) { |
| 104 rtc_source_set("rtc_event_log_tests") { | 105 rtc_source_set("rtc_event_log_tests") { |
| 105 testonly = true | 106 testonly = true |
| 106 sources = [ | 107 sources = [ |
| 107 "rtc_event_log/ringbuffer_unittest.cc", | 108 "rtc_event_log/ringbuffer_unittest.cc", |
| 108 "rtc_event_log/rtc_event_log_unittest.cc", | 109 "rtc_event_log/rtc_event_log_unittest.cc", |
| 109 "rtc_event_log/rtc_event_log_unittest_helper.cc", | 110 "rtc_event_log/rtc_event_log_unittest_helper.cc", |
| 110 ] | 111 ] |
| 111 deps = [ | 112 deps = [ |
| 112 ":rtc_event_log_impl", | 113 ":rtc_event_log_impl", |
| 113 ":rtc_event_log_parser", | 114 ":rtc_event_log_parser", |
| 114 "../base:rtc_base_approved", | 115 "../base:rtc_base_approved", |
| 115 "../base:rtc_base_tests_utils", | 116 "../base:rtc_base_tests_utils", |
| 116 "../call", | 117 "../call", |
| 118 "../modules/audio_coding:audio_network_adaptor", | |
| 117 "../modules/rtp_rtcp", | 119 "../modules/rtp_rtcp", |
| 118 "../system_wrappers:metrics_default", | 120 "../system_wrappers:metrics_default", |
| 119 "../test:test_support", | 121 "../test:test_support", |
| 120 "//testing/gmock", | 122 "//testing/gmock", |
| 121 "//testing/gtest", | 123 "//testing/gtest", |
| 122 ] | 124 ] |
| 123 if (!build_with_chromium && is_clang) { | 125 if (!build_with_chromium && is_clang) { |
| 124 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . | 126 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . |
| 125 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 127 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 126 } | 128 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 166 "../modules/rtp_rtcp:rtp_rtcp", | 168 "../modules/rtp_rtcp:rtp_rtcp", |
| 167 "//third_party/gflags", | 169 "//third_party/gflags", |
| 168 ] | 170 ] |
| 169 if (!build_with_chromium && is_clang) { | 171 if (!build_with_chromium && is_clang) { |
| 170 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . | 172 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . |
| 171 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 173 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 172 } | 174 } |
| 173 } | 175 } |
| 174 } | 176 } |
| 175 } | 177 } |
| OLD | NEW |