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

Side by Side Diff: webrtc/webrtc_tests.gypi

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 | « webrtc/modules/desktop_capture/mac/desktop_configuration.h ('k') | no next file » | 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) 2013 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 'base/macutils_unittest.cc', 157 'base/macutils_unittest.cc',
158 ], 158 ],
159 }], 159 }],
160 ['os_posix==1', { 160 ['os_posix==1', {
161 'sources': [ 161 'sources': [
162 'base/ssladapter_unittest.cc', 162 'base/ssladapter_unittest.cc',
163 'base/sslidentity_unittest.cc', 163 'base/sslidentity_unittest.cc',
164 'base/sslstreamadapter_unittest.cc', 164 'base/sslstreamadapter_unittest.cc',
165 ], 165 ],
166 }], 166 }],
167 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
168 'defines': [
169 'CARBON_DEPRECATED=YES',
170 ],
171 }],
167 ['use_quic==1', { 172 ['use_quic==1', {
168 'sources': [ 173 'sources': [
169 'p2p/quic/quicconnectionhelper_unittest.cc', 174 'p2p/quic/quicconnectionhelper_unittest.cc',
170 'p2p/quic/quicsession_unittest.cc', 175 'p2p/quic/quicsession_unittest.cc',
171 'p2p/quic/quictransport_unittest.cc', 176 'p2p/quic/quictransport_unittest.cc',
172 'p2p/quic/quictransportchannel_unittest.cc', 177 'p2p/quic/quictransportchannel_unittest.cc',
173 'p2p/quic/reliablequicstream_unittest.cc', 178 'p2p/quic/reliablequicstream_unittest.cc',
174 ], 179 ],
175 }], 180 }],
176 ['OS=="android"', { 181 ['OS=="android"', {
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 ['OS=="win"', { 494 ['OS=="win"', {
490 'sources': [ 495 'sources': [
491 'base/win32socketserver_unittest.cc', 496 'base/win32socketserver_unittest.cc',
492 ], 497 ],
493 }], 498 }],
494 ['OS=="mac"', { 499 ['OS=="mac"', {
495 'sources': [ 500 'sources': [
496 'base/macsocketserver_unittest.cc', 501 'base/macsocketserver_unittest.cc',
497 ], 502 ],
498 }], 503 }],
504 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
505 'defines': [
506 'CARBON_DEPRECATED=YES',
507 ],
508 }],
499 ], 509 ],
500 }, 510 },
501 ], 511 ],
502 'conditions': [ 512 'conditions': [
503 ['OS=="android"', { 513 ['OS=="android"', {
504 'targets': [ 514 'targets': [
505 { 515 {
506 'target_name': 'rtc_unittests_apk_target', 516 'target_name': 'rtc_unittests_apk_target',
507 'type': 'none', 517 'type': 'none',
508 'dependencies': [ 518 'dependencies': [
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 'build/isolate.gypi', 660 'build/isolate.gypi',
651 ], 661 ],
652 'sources': [ 662 'sources': [
653 'webrtc_perf_tests.isolate', 663 'webrtc_perf_tests.isolate',
654 ], 664 ],
655 }, 665 },
656 ], 666 ],
657 }], 667 }],
658 ], 668 ],
659 } 669 }
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/mac/desktop_configuration.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698