| 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 sources += [ "base/macutils_unittest.cc" ] | 552 sources += [ "base/macutils_unittest.cc" ] |
| 553 } | 553 } |
| 554 | 554 |
| 555 if (is_posix) { | 555 if (is_posix) { |
| 556 sources += [ | 556 sources += [ |
| 557 "base/ssladapter_unittest.cc", | 557 "base/ssladapter_unittest.cc", |
| 558 "base/sslidentity_unittest.cc", | 558 "base/sslidentity_unittest.cc", |
| 559 "base/sslstreamadapter_unittest.cc", | 559 "base/sslstreamadapter_unittest.cc", |
| 560 ] | 560 ] |
| 561 } | 561 } |
| 562 if (is_ios || (is_mac && target_cpu != "x86")) { | |
| 563 defines = [ "CARBON_DEPRECATED=YES" ] | |
| 564 } | |
| 565 | |
| 566 if (rtc_use_quic) { | 562 if (rtc_use_quic) { |
| 567 sources += [ | 563 sources += [ |
| 568 "p2p/quic/quicconnectionhelper_unittest.cc", | 564 "p2p/quic/quicconnectionhelper_unittest.cc", |
| 569 "p2p/quic/quicsession_unittest.cc", | 565 "p2p/quic/quicsession_unittest.cc", |
| 570 "p2p/quic/quictransport_unittest.cc", | 566 "p2p/quic/quictransport_unittest.cc", |
| 571 "p2p/quic/quictransportchannel_unittest.cc", | 567 "p2p/quic/quictransportchannel_unittest.cc", |
| 572 "p2p/quic/reliablequicstream_unittest.cc", | 568 "p2p/quic/reliablequicstream_unittest.cc", |
| 573 ] | 569 ] |
| 574 } | 570 } |
| 575 | 571 |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 sources += [ "base/win32socketserver_unittest.cc" ] | 814 sources += [ "base/win32socketserver_unittest.cc" ] |
| 819 } | 815 } |
| 820 if (is_android) { | 816 if (is_android) { |
| 821 deps += [ "//testing/android/native_test:native_test_support" ] | 817 deps += [ "//testing/android/native_test:native_test_support" ] |
| 822 shard_timeout = 900 | 818 shard_timeout = 900 |
| 823 } | 819 } |
| 824 | 820 |
| 825 if (is_mac) { | 821 if (is_mac) { |
| 826 sources += [ "base/macsocketserver_unittest.cc" ] | 822 sources += [ "base/macsocketserver_unittest.cc" ] |
| 827 } | 823 } |
| 828 if (is_ios || (is_mac && target_cpu != "x86")) { | |
| 829 defines = [ "CARBON_DEPRECATED=YES" ] | |
| 830 } | |
| 831 if (is_clang) { | 824 if (is_clang) { |
| 832 # Suppress warnings from the Chromium Clang plugin. | 825 # Suppress warnings from the Chromium Clang plugin. |
| 833 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 826 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 834 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 827 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 835 } | 828 } |
| 836 } | 829 } |
| 837 } | 830 } |
| OLD | NEW |