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

Side by Side Diff: webrtc/base/base.gyp

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/base/applefilesystem.mm ('k') | webrtc/base/iosfilesystem.mm » ('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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 'export_dependent_settings': [ 208 'export_dependent_settings': [
209 'rtc_base_approved', 209 'rtc_base_approved',
210 ], 210 ],
211 'defines': [ 211 'defines': [
212 'FEATURE_ENABLE_SSL', 212 'FEATURE_ENABLE_SSL',
213 'SSL_USE_OPENSSL', 213 'SSL_USE_OPENSSL',
214 'HAVE_OPENSSL_SSL_H', 214 'HAVE_OPENSSL_SSL_H',
215 'LOGGING=1', 215 'LOGGING=1',
216 ], 216 ],
217 'sources': [ 217 'sources': [
218 'applefilesystem.mm',
219 'arraysize.h', 218 'arraysize.h',
220 'asyncfile.cc', 219 'asyncfile.cc',
221 'asyncfile.h', 220 'asyncfile.h',
222 'asyncinvoker.cc', 221 'asyncinvoker.cc',
223 'asyncinvoker.h', 222 'asyncinvoker.h',
224 'asyncinvoker-inl.h', 223 'asyncinvoker-inl.h',
225 'asyncpacketsocket.cc', 224 'asyncpacketsocket.cc',
226 'asyncpacketsocket.h', 225 'asyncpacketsocket.h',
227 'asyncresolverinterface.cc', 226 'asyncresolverinterface.cc',
228 'asyncresolverinterface.h', 227 'asyncresolverinterface.h',
(...skipping 28 matching lines...) Expand all
257 'helpers.h', 256 'helpers.h',
258 'httpbase.cc', 257 'httpbase.cc',
259 'httpbase.h', 258 'httpbase.h',
260 'httpclient.cc', 259 'httpclient.cc',
261 'httpclient.h', 260 'httpclient.h',
262 'httpcommon-inl.h', 261 'httpcommon-inl.h',
263 'httpcommon.cc', 262 'httpcommon.cc',
264 'httpcommon.h', 263 'httpcommon.h',
265 'httprequest.cc', 264 'httprequest.cc',
266 'httprequest.h', 265 'httprequest.h',
266 'iosfilesystem.mm',
267 'ipaddress.cc', 267 'ipaddress.cc',
268 'ipaddress.h', 268 'ipaddress.h',
269 'linked_ptr.h', 269 'linked_ptr.h',
270 'messagedigest.cc', 270 'messagedigest.cc',
271 'messagedigest.h', 271 'messagedigest.h',
272 'messagehandler.cc', 272 'messagehandler.cc',
273 'messagehandler.h', 273 'messagehandler.h',
274 'messagequeue.cc', 274 'messagequeue.cc',
275 'messagequeue.h', 275 'messagequeue.h',
276 'nethelpers.cc', 276 'nethelpers.cc',
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 'OTHER_LDFLAGS': [ 582 'OTHER_LDFLAGS': [
583 '-framework Cocoa', 583 '-framework Cocoa',
584 '-framework Foundation', 584 '-framework Foundation',
585 '-framework IOKit', 585 '-framework IOKit',
586 '-framework Security', 586 '-framework Security',
587 '-framework SystemConfiguration', 587 '-framework SystemConfiguration',
588 ], 588 ],
589 }, 589 },
590 }, 590 },
591 }, 591 },
592 'conditions': [
593 ['target_arch=="ia32"', {
594 'all_dependent_settings': {
595 'link_settings': {
596 'xcode_settings': {
597 'OTHER_LDFLAGS': [
598 '-framework Carbon',
599 ],
600 },
601 },
602 },
603 }],
604 ],
592 }], 605 }],
593 ['OS=="win" and nacl_untrusted_build==0', { 606 ['OS=="win" and nacl_untrusted_build==0', {
594 'sources': [ 607 'sources': [
595 'win32.cc', 608 'win32.cc',
596 'win32.h', 609 'win32.h',
597 'win32filesystem.cc', 610 'win32filesystem.cc',
598 'win32filesystem.h', 611 'win32filesystem.h',
599 'win32securityerrors.cc', 612 'win32securityerrors.cc',
600 'win32window.cc', 613 'win32window.cc',
601 'win32window.h', 614 'win32window.h',
(...skipping 28 matching lines...) Expand all
630 'Debug_Base': { 643 'Debug_Base': {
631 'defines': [ 644 'defines': [
632 # Chromium's build/common.gypi defines this for all posix 645 # Chromium's build/common.gypi defines this for all posix
633 # _except_ for ios & mac. We want it there as well, e.g. 646 # _except_ for ios & mac. We want it there as well, e.g.
634 # because ASSERT and friends trigger off of it. 647 # because ASSERT and friends trigger off of it.
635 '_DEBUG', 648 '_DEBUG',
636 ], 649 ],
637 }, 650 },
638 } 651 }
639 }], 652 }],
653 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
654 'defines': [
655 'CARBON_DEPRECATED=YES',
656 ],
657 }],
640 ['OS=="linux" or OS=="android"', { 658 ['OS=="linux" or OS=="android"', {
641 'sources': [ 659 'sources': [
642 'linux.cc', 660 'linux.cc',
643 'linux.h', 661 'linux.h',
644 ], 662 ],
645 }], 663 }],
646 ['build_ssl==1', { 664 ['build_ssl==1', {
647 'dependencies': [ 665 'dependencies': [
648 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl', 666 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
649 ], 667 ],
650 }, { 668 }, {
651 'include_dirs': [ 669 'include_dirs': [
652 '<(ssl_root)', 670 '<(ssl_root)',
653 ], 671 ],
654 }], 672 }],
655 ], 673 ],
656 }, 674 },
657 { 675 {
658 'target_name': 'gtest_prod', 676 'target_name': 'gtest_prod',
659 'type': 'static_library', 677 'type': 'static_library',
660 'sources': [ 678 'sources': [
661 'gtest_prod_util.h', 679 'gtest_prod_util.h',
662 ], 680 ],
663 }, 681 },
664 ], 682 ],
665 } 683 }
OLDNEW
« no previous file with comments | « webrtc/base/applefilesystem.mm ('k') | webrtc/base/iosfilesystem.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698