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") |
| 11 if (is_android) { | 11 if (is_android) { |
| 12 import("//build/config/android/config.gni") | 12 import("//build/config/android/config.gni") |
| 13 import("//build/config/android/rules.gni") | 13 import("//build/config/android/rules.gni") |
| 14 } | 14 } |
| 15 | 15 |
| 16 group("logging") { | 16 group("logging") { |
| 17 public_deps = [ | 17 public_deps = [ |
| 18 ":rtc_event_log_impl", | 18 ":rtc_event_log_impl", |
| 19 ] | 19 ] |
| 20 if (rtc_enable_protobuf) { | 20 if (rtc_enable_protobuf) { |
| 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/6828) | |
| 27 # Enabling GN check triggers cyclic dependency error: | |
| 28 # //webrtc/logging:rtc_event_log_api -> | |
| 29 # //webrtc/modules/audio_coding:audio_network_adaptor -> | |
| 30 # //webrtc/logging:rtc_event_log_api | |
| 31 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
| |
| 26 sources = [ | 32 sources = [ |
| 27 "rtc_event_log/rtc_event_log.h", | 33 "rtc_event_log/rtc_event_log.h", |
| 28 ] | 34 ] |
| 35 deps = [ | |
| 36 "../base:rtc_base_approved", | |
| 37 "../call:call_interfaces", | |
| 38 "../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
| |
| 39 ] | |
| 29 } | 40 } |
| 30 | 41 |
| 31 rtc_static_library("rtc_event_log_impl") { | 42 rtc_static_library("rtc_event_log_impl") { |
| 32 sources = [ | 43 sources = [ |
| 33 "rtc_event_log/ringbuffer.h", | 44 "rtc_event_log/ringbuffer.h", |
| 34 "rtc_event_log/rtc_event_log.cc", | 45 "rtc_event_log/rtc_event_log.cc", |
| 35 "rtc_event_log/rtc_event_log_helper_thread.cc", | 46 "rtc_event_log/rtc_event_log_helper_thread.cc", |
| 36 "rtc_event_log/rtc_event_log_helper_thread.h", | 47 "rtc_event_log/rtc_event_log_helper_thread.h", |
| 37 ] | 48 ] |
| 38 | 49 |
| 39 defines = [] | 50 defines = [] |
| 40 | 51 |
| 41 deps = [ | 52 deps = [ |
| 42 ":rtc_event_log_api", | 53 ":rtc_event_log_api", |
| 43 "..:webrtc_common", | 54 "..:webrtc_common", |
| 55 "../base:rtc_base_approved", | |
| 44 "../call:call_interfaces", | 56 "../call:call_interfaces", |
| 45 "../modules/audio_coding:audio_network_adaptor", | 57 "../modules/audio_coding:audio_network_adaptor", |
| 46 "../modules/rtp_rtcp", | 58 "../modules/rtp_rtcp", |
| 59 "../system_wrappers", | |
| 47 ] | 60 ] |
| 48 | 61 |
| 49 if (rtc_enable_protobuf) { | 62 if (rtc_enable_protobuf) { |
| 50 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 63 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 51 deps += [ ":rtc_event_log_proto" ] | 64 deps += [ ":rtc_event_log_proto" ] |
| 52 } | 65 } |
| 53 if (!build_with_chromium && is_clang) { | 66 if (!build_with_chromium && is_clang) { |
| 54 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 67 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 55 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 68 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 56 } | 69 } |
| 57 } | 70 } |
| 58 | 71 |
| 59 if (rtc_enable_protobuf) { | 72 if (rtc_enable_protobuf) { |
| 60 proto_library("rtc_event_log_proto") { | 73 proto_library("rtc_event_log_proto") { |
| 61 sources = [ | 74 sources = [ |
| 62 "rtc_event_log/rtc_event_log.proto", | 75 "rtc_event_log/rtc_event_log.proto", |
| 63 ] | 76 ] |
| 64 proto_out_dir = "webrtc/logging/rtc_event_log" | 77 proto_out_dir = "webrtc/logging/rtc_event_log" |
| 65 } | 78 } |
| 66 | 79 |
| 67 rtc_static_library("rtc_event_log_parser") { | 80 rtc_static_library("rtc_event_log_parser") { |
| 68 sources = [ | 81 sources = [ |
| 69 "rtc_event_log/rtc_event_log_parser.cc", | 82 "rtc_event_log/rtc_event_log_parser.cc", |
| 70 "rtc_event_log/rtc_event_log_parser.h", | 83 "rtc_event_log/rtc_event_log_parser.h", |
| 71 ] | 84 ] |
| 72 | 85 |
| 73 public_deps = [ | 86 public_deps = [ |
| 87 ":rtc_event_log_api", | |
| 74 ":rtc_event_log_proto", | 88 ":rtc_event_log_proto", |
| 75 "..:webrtc_common", | 89 "..:webrtc_common", |
| 90 "../call:call_interfaces", | |
| 91 "../modules/rtp_rtcp:rtp_rtcp", | |
| 92 "../system_wrappers", | |
| 76 ] | 93 ] |
| 77 | 94 |
| 78 if (!build_with_chromium && is_clang) { | 95 if (!build_with_chromium && is_clang) { |
| 79 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 96 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 80 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 97 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 81 } | 98 } |
| 99 deps = [ | |
| 100 "../base:rtc_base_approved", | |
| 101 ] | |
| 82 } | 102 } |
| 83 | 103 |
| 84 if (rtc_include_tests) { | 104 if (rtc_include_tests) { |
| 85 rtc_source_set("rtc_event_log_tests") { | 105 rtc_source_set("rtc_event_log_tests") { |
| 86 testonly = true | 106 testonly = true |
| 87 sources = [ | 107 sources = [ |
| 88 "rtc_event_log/ringbuffer_unittest.cc", | 108 "rtc_event_log/ringbuffer_unittest.cc", |
| 89 "rtc_event_log/rtc_event_log_unittest.cc", | 109 "rtc_event_log/rtc_event_log_unittest.cc", |
| 90 "rtc_event_log/rtc_event_log_unittest_helper.cc", | 110 "rtc_event_log/rtc_event_log_unittest_helper.cc", |
| 91 ] | 111 ] |
| 92 deps = [ | 112 deps = [ |
| 93 ":rtc_event_log_impl", | 113 ":rtc_event_log_impl", |
| 94 ":rtc_event_log_parser", | 114 ":rtc_event_log_parser", |
| 115 "../base:rtc_base_approved", | |
| 116 "../base:rtc_base_tests_utils", | |
| 95 "../call", | 117 "../call", |
| 96 "../modules/rtp_rtcp", | 118 "../modules/rtp_rtcp", |
| 97 "../system_wrappers:metrics_default", | 119 "../system_wrappers:metrics_default", |
| 120 "../test:test_support", | |
| 98 "//testing/gmock", | 121 "//testing/gmock", |
| 99 "//testing/gtest", | 122 "//testing/gtest", |
| 100 ] | 123 ] |
| 101 if (!build_with_chromium && is_clang) { | 124 if (!build_with_chromium && is_clang) { |
| 102 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . | 125 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . |
| 103 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 126 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 104 } | 127 } |
| 105 } | 128 } |
| 106 rtc_test("rtc_event_log2rtp_dump") { | 129 rtc_test("rtc_event_log2rtp_dump") { |
| 107 testonly = true | 130 testonly = true |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 130 rtc_executable("rtc_event_log2text") { | 153 rtc_executable("rtc_event_log2text") { |
| 131 testonly = true | 154 testonly = true |
| 132 sources = [ | 155 sources = [ |
| 133 "rtc_event_log/rtc_event_log2text.cc", | 156 "rtc_event_log/rtc_event_log2text.cc", |
| 134 ] | 157 ] |
| 135 deps = [ | 158 deps = [ |
| 136 ":rtc_event_log_api", | 159 ":rtc_event_log_api", |
| 137 ":rtc_event_log_impl", | 160 ":rtc_event_log_impl", |
| 138 ":rtc_event_log_parser", | 161 ":rtc_event_log_parser", |
| 139 "../base:rtc_base_approved", | 162 "../base:rtc_base_approved", |
| 163 "../call:call_interfaces", | |
| 140 | 164 |
| 141 # TODO(kwiberg): Remove this dependency. | 165 # TODO(kwiberg): Remove this dependency. |
| 142 "../api/audio_codecs:audio_codecs_api", | 166 "../api/audio_codecs:audio_codecs_api", |
| 143 "../modules/rtp_rtcp:rtp_rtcp", | 167 "../modules/rtp_rtcp:rtp_rtcp", |
| 144 "//third_party/gflags", | 168 "//third_party/gflags", |
| 145 ] | 169 ] |
| 146 if (!build_with_chromium && is_clang) { | 170 if (!build_with_chromium && is_clang) { |
| 147 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . | 171 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . |
| 148 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 172 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 149 } | 173 } |
| 150 } | 174 } |
| 151 } | 175 } |
| 152 } | 176 } |
| OLD | NEW |