| 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 "call/rtc_event_log_helper_thread.cc", | 334 "call/rtc_event_log_helper_thread.cc", |
| 335 "call/rtc_event_log_helper_thread.h", | 335 "call/rtc_event_log_helper_thread.h", |
| 336 ] | 336 ] |
| 337 | 337 |
| 338 defines = [] | 338 defines = [] |
| 339 configs += [ ":common_config" ] | 339 configs += [ ":common_config" ] |
| 340 public_configs = [ ":common_inherited_config" ] | 340 public_configs = [ ":common_inherited_config" ] |
| 341 | 341 |
| 342 deps = [ | 342 deps = [ |
| 343 ":webrtc_common", | 343 ":webrtc_common", |
| 344 "//webrtc/modules/rtp_rtcp", | |
| 345 ] | 344 ] |
| 346 | 345 |
| 347 if (rtc_enable_protobuf) { | 346 if (rtc_enable_protobuf) { |
| 348 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 347 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 349 deps += [ ":rtc_event_log_proto" ] | 348 deps += [ ":rtc_event_log_proto" ] |
| 350 } | 349 } |
| 351 if (is_clang && !is_nacl) { | 350 if (is_clang && !is_nacl) { |
| 352 # Suppress warnings from Chrome's Clang plugins. | 351 # Suppress warnings from Chrome's Clang plugins. |
| 353 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 352 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 354 configs -= [ "//build/config/clang:find_bad_constructs" ] | 353 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 if (is_ios || (is_mac && target_cpu != "x86")) { | 766 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 768 defines = [ "CARBON_DEPRECATED=YES" ] | 767 defines = [ "CARBON_DEPRECATED=YES" ] |
| 769 } | 768 } |
| 770 if (is_clang) { | 769 if (is_clang) { |
| 771 # Suppress warnings from the Chromium Clang plugin. | 770 # Suppress warnings from the Chromium Clang plugin. |
| 772 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 771 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 773 configs -= [ "//build/config/clang:find_bad_constructs" ] | 772 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 774 } | 773 } |
| 775 } | 774 } |
| 776 } | 775 } |
| OLD | NEW |