OLD | NEW |
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
10 | 10 |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 configs += [ ":common_config" ] | 263 configs += [ ":common_config" ] |
264 public_configs = [ ":common_inherited_config" ] | 264 public_configs = [ ":common_inherited_config" ] |
265 | 265 |
266 deps = [ | 266 deps = [ |
267 ":webrtc_common", | 267 ":webrtc_common", |
268 ] | 268 ] |
269 | 269 |
270 if (rtc_enable_protobuf) { | 270 if (rtc_enable_protobuf) { |
271 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 271 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
272 deps += [ ":rtc_event_log_proto" ] | 272 deps += [ ":rtc_event_log_proto" ] |
| 273 sources += [ |
| 274 "video/rtc_event_log_parser.cc", |
| 275 "video/rtc_event_log_parser.h", |
| 276 ] |
273 } | 277 } |
274 if (is_clang && !is_nacl) { | 278 if (is_clang && !is_nacl) { |
275 # Suppress warnings from Chrome's Clang plugins. | 279 # Suppress warnings from Chrome's Clang plugins. |
276 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 280 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
277 configs -= [ "//build/config/clang:find_bad_constructs" ] | 281 configs -= [ "//build/config/clang:find_bad_constructs" ] |
278 } | 282 } |
279 } | 283 } |
OLD | NEW |