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 24 matching lines...) Expand all Loading... | |
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 "../call:call_interfaces", | 44 "../call:call_interfaces", |
45 "../modules/audio_coding:audio_network_adaptor", | |
45 "../modules/rtp_rtcp", | 46 "../modules/rtp_rtcp", |
46 ] | 47 ] |
47 | 48 |
48 if (rtc_enable_protobuf) { | 49 if (rtc_enable_protobuf) { |
49 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 50 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
50 deps += [ ":rtc_event_log_proto" ] | 51 deps += [ ":rtc_event_log_proto" ] |
51 } | 52 } |
52 if (!build_with_chromium && is_clang) { | 53 if (!build_with_chromium && is_clang) { |
53 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 54 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
54 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 55 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
55 } | 56 } |
56 } | 57 } |
57 | 58 |
58 if (rtc_enable_protobuf) { | 59 if (rtc_enable_protobuf) { |
59 proto_library("rtc_event_log_proto") { | 60 proto_library("rtc_event_log_proto") { |
60 sources = [ | 61 sources = [ |
61 "rtc_event_log/rtc_event_log.proto", | 62 "rtc_event_log/rtc_event_log.proto", |
62 ] | 63 ] |
63 proto_out_dir = "webrtc/logging/rtc_event_log" | 64 proto_in_dir = "//" |
minyue-webrtc
2017/01/19 11:35:33
This change is not needed and is likely the reason
| |
65 proto_out_dir = "." | |
64 } | 66 } |
65 | 67 |
66 rtc_static_library("rtc_event_log_parser") { | 68 rtc_static_library("rtc_event_log_parser") { |
67 sources = [ | 69 sources = [ |
68 "rtc_event_log/rtc_event_log_parser.cc", | 70 "rtc_event_log/rtc_event_log_parser.cc", |
69 "rtc_event_log/rtc_event_log_parser.h", | 71 "rtc_event_log/rtc_event_log_parser.h", |
70 ] | 72 ] |
71 | 73 |
72 public_deps = [ | 74 public_deps = [ |
73 ":rtc_event_log_proto", | 75 ":rtc_event_log_proto", |
(...skipping 23 matching lines...) Expand all Loading... | |
97 "//testing/gmock", | 99 "//testing/gmock", |
98 "//testing/gtest", | 100 "//testing/gtest", |
99 ] | 101 ] |
100 if (!build_with_chromium && is_clang) { | 102 if (!build_with_chromium && is_clang) { |
101 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . | 103 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) . |
102 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 104 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
103 } | 105 } |
104 } | 106 } |
105 } | 107 } |
106 } | 108 } |
OLD | NEW |