Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: webrtc/logging/BUILD.gn

Issue 2745473003: Resolve cyclic dependency between audio network adaptor and event log api (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 "rtc_event_log/rtc_event_log_helper_thread.h", 46 "rtc_event_log/rtc_event_log_helper_thread.h",
47 ] 47 ]
48 48
49 defines = [] 49 defines = []
50 50
51 deps = [ 51 deps = [
52 ":rtc_event_log_api", 52 ":rtc_event_log_api",
53 "..:webrtc_common", 53 "..:webrtc_common",
54 "../base:rtc_base_approved", 54 "../base:rtc_base_approved",
55 "../call:call_interfaces", 55 "../call:call_interfaces",
56 "../modules/audio_coding:audio_network_adaptor", 56 "../modules/audio_coding:audio_network_adaptor",
terelius 2017/03/09 14:28:59 This should be removed, right?
michaelt 2017/03/09 14:42:54 No, since its really used in the rtc_event_log_imp
terelius 2017/03/10 10:26:57 Sorry. I mixed up the build targets.
57 "../modules/rtp_rtcp", 57 "../modules/rtp_rtcp",
58 "../system_wrappers", 58 "../system_wrappers",
59 ] 59 ]
60 60
61 if (rtc_enable_protobuf) { 61 if (rtc_enable_protobuf) {
62 defines += [ "ENABLE_RTC_EVENT_LOG" ] 62 defines += [ "ENABLE_RTC_EVENT_LOG" ]
63 deps += [ ":rtc_event_log_proto" ] 63 deps += [ ":rtc_event_log_proto" ]
64 } 64 }
65 if (!build_with_chromium && is_clang) { 65 if (!build_with_chromium && is_clang) {
66 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 66 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
(...skipping 13 matching lines...) Expand all
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
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698