| 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 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 if (rtc_enable_protobuf) { | 351 if (rtc_enable_protobuf) { |
| 352 source_set("rtc_event_log_parser") { | 352 source_set("rtc_event_log_parser") { |
| 353 sources = [ | 353 sources = [ |
| 354 "call/rtc_event_log_parser.cc", | 354 "call/rtc_event_log_parser.cc", |
| 355 "call/rtc_event_log_parser.h", | 355 "call/rtc_event_log_parser.h", |
| 356 ] | 356 ] |
| 357 | 357 |
| 358 configs += [ ":common_config" ] | 358 configs += [ ":common_config" ] |
| 359 public_configs = [ ":common_inherited_config" ] | 359 public_configs = [ ":common_inherited_config" ] |
| 360 | 360 |
| 361 deps = [ | 361 public_deps = [ |
| 362 ":rtc_event_log_proto", | 362 ":rtc_event_log_proto", |
| 363 ":webrtc_common", | 363 ":webrtc_common", |
| 364 ] | 364 ] |
| 365 | 365 |
| 366 if (is_clang && !is_nacl) { | 366 if (is_clang && !is_nacl) { |
| 367 # Suppress warnings from Chrome's Clang plugins. | 367 # Suppress warnings from Chrome's Clang plugins. |
| 368 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 368 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 369 configs -= [ "//build/config/clang:find_bad_constructs" ] | 369 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 370 } | 370 } |
| 371 } | 371 } |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 if (is_ios || (is_mac && target_cpu != "x86")) { | 656 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 657 defines = [ "CARBON_DEPRECATED=YES" ] | 657 defines = [ "CARBON_DEPRECATED=YES" ] |
| 658 } | 658 } |
| 659 if (is_clang) { | 659 if (is_clang) { |
| 660 # Suppress warnings from the Chromium Clang plugin. | 660 # Suppress warnings from the Chromium Clang plugin. |
| 661 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 661 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 662 configs -= [ "//build/config/clang:find_bad_constructs" ] | 662 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 663 } | 663 } |
| 664 } | 664 } |
| 665 } | 665 } |
| OLD | NEW |