Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: webrtc/BUILD.gn

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
577 if (rtc_use_quic) { 581 if (rtc_use_quic) {
578 sources += [ 582 sources += [
579 "p2p/quic/quicconnectionhelper_unittest.cc", 583 "p2p/quic/quicconnectionhelper_unittest.cc",
580 "p2p/quic/quicsession_unittest.cc", 584 "p2p/quic/quicsession_unittest.cc",
581 "p2p/quic/quictransport_unittest.cc", 585 "p2p/quic/quictransport_unittest.cc",
582 "p2p/quic/quictransportchannel_unittest.cc", 586 "p2p/quic/quictransportchannel_unittest.cc",
583 "p2p/quic/reliablequicstream_unittest.cc", 587 "p2p/quic/reliablequicstream_unittest.cc",
584 ] 588 ]
585 } 589 }
586 590
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 sources += [ "base/win32socketserver_unittest.cc" ] 850 sources += [ "base/win32socketserver_unittest.cc" ]
847 } 851 }
848 if (is_android) { 852 if (is_android) {
849 deps += [ "//testing/android/native_test:native_test_support" ] 853 deps += [ "//testing/android/native_test:native_test_support" ]
850 shard_timeout = 900 854 shard_timeout = 900
851 } 855 }
852 856
853 if (is_mac) { 857 if (is_mac) {
854 sources += [ "base/macsocketserver_unittest.cc" ] 858 sources += [ "base/macsocketserver_unittest.cc" ]
855 } 859 }
860 if (is_ios || (is_mac && target_cpu != "x86")) {
861 defines = [ "CARBON_DEPRECATED=YES" ]
862 }
856 if (is_clang) { 863 if (is_clang) {
857 # Suppress warnings from the Chromium Clang plugin. 864 # Suppress warnings from the Chromium Clang plugin.
858 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 865 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
859 configs -= [ "//build/config/clang:find_bad_constructs" ] 866 configs -= [ "//build/config/clang:find_bad_constructs" ]
860 } 867 }
861 } 868 }
862 } 869 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698