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("../build/webrtc.gni") | 9 import("../build/webrtc.gni") |
| 10 import("//third_party/protobuf/proto_library.gni") | 10 import("//third_party/protobuf/proto_library.gni") |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 "rtc_event_log/rtc_event_log.cc", | 34 "rtc_event_log/rtc_event_log.cc", |
| 35 "rtc_event_log/rtc_event_log_helper_thread.cc", | 35 "rtc_event_log/rtc_event_log_helper_thread.cc", |
| 36 "rtc_event_log/rtc_event_log_helper_thread.h", | 36 "rtc_event_log/rtc_event_log_helper_thread.h", |
| 37 ] | 37 ] |
| 38 | 38 |
| 39 defines = [] | 39 defines = [] |
| 40 | 40 |
| 41 deps = [ | 41 deps = [ |
| 42 ":rtc_event_log_api", | 42 ":rtc_event_log_api", |
| 43 "..:webrtc_common", | 43 "..:webrtc_common", |
| 44 "../api:call_api", | |
|
the sun
2017/01/12 13:35:06
call_api only pulls in "call/audio_sink.h" directl
michaelt
2017/01/12 14:36:54
Removed i seams this is just a dependency for a ol
| |
| 44 "../call:call_interfaces", | 45 "../call:call_interfaces", |
| 46 "../modules/audio_coding:audio_network_adaptor", | |
| 45 "../modules/rtp_rtcp", | 47 "../modules/rtp_rtcp", |
| 46 ] | 48 ] |
| 47 | 49 |
| 48 if (rtc_enable_protobuf) { | 50 if (rtc_enable_protobuf) { |
| 49 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 51 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 50 deps += [ ":rtc_event_log_proto" ] | 52 deps += [ ":rtc_event_log_proto" ] |
| 51 } | 53 } |
| 52 if (!build_with_chromium && is_clang) { | 54 if (!build_with_chromium && is_clang) { |
| 53 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 55 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 54 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 56 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 77 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 79 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 78 } | 80 } |
| 79 } | 81 } |
| 80 } | 82 } |
| 81 | 83 |
| 82 if (rtc_enable_protobuf) { | 84 if (rtc_enable_protobuf) { |
| 83 proto_library("rtc_event_log_proto") { | 85 proto_library("rtc_event_log_proto") { |
| 84 sources = [ | 86 sources = [ |
| 85 "rtc_event_log/rtc_event_log.proto", | 87 "rtc_event_log/rtc_event_log.proto", |
| 86 ] | 88 ] |
| 87 proto_out_dir = "webrtc/logging/rtc_event_log" | 89 proto_in_dir = "//" |
| 90 proto_out_dir = "." | |
| 88 } | 91 } |
| 89 } | 92 } |
| 90 | 93 |
| 91 if (rtc_enable_protobuf) { | 94 if (rtc_enable_protobuf) { |
| 92 rtc_static_library("rtc_event_log_parser") { | 95 rtc_static_library("rtc_event_log_parser") { |
| 93 sources = [ | 96 sources = [ |
| 94 "rtc_event_log/rtc_event_log_parser.cc", | 97 "rtc_event_log/rtc_event_log_parser.cc", |
| 95 "rtc_event_log/rtc_event_log_parser.h", | 98 "rtc_event_log/rtc_event_log_parser.h", |
| 96 ] | 99 ] |
| 97 | 100 |
| 98 public_deps = [ | 101 public_deps = [ |
| 99 ":rtc_event_log_proto", | 102 ":rtc_event_log_proto", |
| 100 "..:webrtc_common", | 103 "..:webrtc_common", |
| 101 ] | 104 ] |
| 102 | 105 |
| 103 if (!build_with_chromium && is_clang) { | 106 if (!build_with_chromium && is_clang) { |
| 104 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 107 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 105 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 108 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 106 } | 109 } |
| 107 } | 110 } |
| 108 } | 111 } |
| OLD | NEW |