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

Side by Side Diff: webrtc/webrtc_tests.gypi

Issue 2317343003: Revert of move 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 'base/macutils_unittest.cc', 158 'base/macutils_unittest.cc',
159 ], 159 ],
160 }], 160 }],
161 ['os_posix==1', { 161 ['os_posix==1', {
162 'sources': [ 162 'sources': [
163 'base/ssladapter_unittest.cc', 163 'base/ssladapter_unittest.cc',
164 'base/sslidentity_unittest.cc', 164 'base/sslidentity_unittest.cc',
165 'base/sslstreamadapter_unittest.cc', 165 'base/sslstreamadapter_unittest.cc',
166 ], 166 ],
167 }], 167 }],
168 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
169 'defines': [
170 'CARBON_DEPRECATED=YES',
171 ],
172 }],
168 ['use_quic==1', { 173 ['use_quic==1', {
169 'sources': [ 174 'sources': [
170 'p2p/quic/quicconnectionhelper_unittest.cc', 175 'p2p/quic/quicconnectionhelper_unittest.cc',
171 'p2p/quic/quicsession_unittest.cc', 176 'p2p/quic/quicsession_unittest.cc',
172 'p2p/quic/quictransport_unittest.cc', 177 'p2p/quic/quictransport_unittest.cc',
173 'p2p/quic/quictransportchannel_unittest.cc', 178 'p2p/quic/quictransportchannel_unittest.cc',
174 'p2p/quic/reliablequicstream_unittest.cc', 179 'p2p/quic/reliablequicstream_unittest.cc',
175 ], 180 ],
176 }], 181 }],
177 ['OS=="android"', { 182 ['OS=="android"', {
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 ['OS=="win"', { 496 ['OS=="win"', {
492 'sources': [ 497 'sources': [
493 'base/win32socketserver_unittest.cc', 498 'base/win32socketserver_unittest.cc',
494 ], 499 ],
495 }], 500 }],
496 ['OS=="mac"', { 501 ['OS=="mac"', {
497 'sources': [ 502 'sources': [
498 'base/macsocketserver_unittest.cc', 503 'base/macsocketserver_unittest.cc',
499 ], 504 ],
500 }], 505 }],
506 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
507 'defines': [
508 'CARBON_DEPRECATED=YES',
509 ],
510 }],
501 ], 511 ],
502 }, 512 },
503 ], 513 ],
504 'conditions': [ 514 'conditions': [
505 ['OS=="android"', { 515 ['OS=="android"', {
506 'targets': [ 516 'targets': [
507 { 517 {
508 'target_name': 'rtc_unittests_apk_target', 518 'target_name': 'rtc_unittests_apk_target',
509 'type': 'none', 519 'type': 'none',
510 'dependencies': [ 520 'dependencies': [
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 'build/isolate.gypi', 662 'build/isolate.gypi',
653 ], 663 ],
654 'sources': [ 664 'sources': [
655 'webrtc_perf_tests.isolate', 665 'webrtc_perf_tests.isolate',
656 ], 666 ],
657 }, 667 },
658 ], 668 ],
659 }], 669 }],
660 ], 670 ],
661 } 671 }
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