| 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 sources += [ "base/macutils_unittest.cc" ] | 567 sources += [ "base/macutils_unittest.cc" ] |
| 568 } | 568 } |
| 569 | 569 |
| 570 if (is_posix) { | 570 if (is_posix) { |
| 571 sources += [ | 571 sources += [ |
| 572 "base/ssladapter_unittest.cc", | 572 "base/ssladapter_unittest.cc", |
| 573 "base/sslidentity_unittest.cc", | 573 "base/sslidentity_unittest.cc", |
| 574 "base/sslstreamadapter_unittest.cc", | 574 "base/sslstreamadapter_unittest.cc", |
| 575 ] | 575 ] |
| 576 } | 576 } |
| 577 if (is_ios || (is_mac && target_cpu != "x86")) { | |
| 578 defines = [ "CARBON_DEPRECATED=YES" ] | |
| 579 } | |
| 580 | |
| 581 if (rtc_use_quic) { | 577 if (rtc_use_quic) { |
| 582 sources += [ | 578 sources += [ |
| 583 "p2p/quic/quicconnectionhelper_unittest.cc", | 579 "p2p/quic/quicconnectionhelper_unittest.cc", |
| 584 "p2p/quic/quicsession_unittest.cc", | 580 "p2p/quic/quicsession_unittest.cc", |
| 585 "p2p/quic/quictransport_unittest.cc", | 581 "p2p/quic/quictransport_unittest.cc", |
| 586 "p2p/quic/quictransportchannel_unittest.cc", | 582 "p2p/quic/quictransportchannel_unittest.cc", |
| 587 "p2p/quic/reliablequicstream_unittest.cc", | 583 "p2p/quic/reliablequicstream_unittest.cc", |
| 588 ] | 584 ] |
| 589 } | 585 } |
| 590 | 586 |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 sources += [ "base/win32socketserver_unittest.cc" ] | 846 sources += [ "base/win32socketserver_unittest.cc" ] |
| 851 } | 847 } |
| 852 if (is_android) { | 848 if (is_android) { |
| 853 deps += [ "//testing/android/native_test:native_test_support" ] | 849 deps += [ "//testing/android/native_test:native_test_support" ] |
| 854 shard_timeout = 900 | 850 shard_timeout = 900 |
| 855 } | 851 } |
| 856 | 852 |
| 857 if (is_mac) { | 853 if (is_mac) { |
| 858 sources += [ "base/macsocketserver_unittest.cc" ] | 854 sources += [ "base/macsocketserver_unittest.cc" ] |
| 859 } | 855 } |
| 860 if (is_ios || (is_mac && target_cpu != "x86")) { | |
| 861 defines = [ "CARBON_DEPRECATED=YES" ] | |
| 862 } | |
| 863 if (is_clang) { | 856 if (is_clang) { |
| 864 # Suppress warnings from the Chromium Clang plugin. | 857 # Suppress warnings from the Chromium Clang plugin. |
| 865 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 858 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 866 configs -= [ "//build/config/clang:find_bad_constructs" ] | 859 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 867 } | 860 } |
| 868 } | 861 } |
| 869 } | 862 } |
| OLD | NEW |