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

Side by Side Diff: webrtc/BUILD.gn

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