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

Side by Side Diff: webrtc/base/BUILD.gn

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/BUILD.gn ('k') | webrtc/base/applefilesystem.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 import("//build/config/crypto.gni") 9 import("//build/config/crypto.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 ] 58 ]
59 } 59 }
60 if (is_mac) { 60 if (is_mac) {
61 libs = [ 61 libs = [
62 "Cocoa.framework", 62 "Cocoa.framework",
63 "Foundation.framework", 63 "Foundation.framework",
64 "IOKit.framework", 64 "IOKit.framework",
65 "Security.framework", 65 "Security.framework",
66 "SystemConfiguration.framework", 66 "SystemConfiguration.framework",
67 ] 67 ]
68 if (current_cpu == "x86") {
69 libs += [ "Carbon.framework" ]
70 }
68 } 71 }
69 } 72 }
70 73
71 if (is_linux && !build_with_chromium) { 74 if (is_linux && !build_with_chromium) {
72 # Provides the same functionality as the //crypto:platform target, which 75 # Provides the same functionality as the //crypto:platform target, which
73 # WebRTC cannot use as we don't sync src/crypto from Chromium. 76 # WebRTC cannot use as we don't sync src/crypto from Chromium.
74 group("linux_system_ssl") { 77 group("linux_system_ssl") {
75 deps = [ 78 deps = [
76 "//third_party/boringssl", 79 "//third_party/boringssl",
77 ] 80 ]
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 284
282 public_configs = [ 285 public_configs = [
283 ":openssl_config", 286 ":openssl_config",
284 ":rtc_base_config", 287 ":rtc_base_config",
285 ] 288 ]
286 289
287 all_dependent_configs = [ ":rtc_base_all_dependent_config" ] 290 all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
288 defines = [ "LOGGING=1" ] 291 defines = [ "LOGGING=1" ]
289 292
290 sources = [ 293 sources = [
291 "applefilesystem.mm",
292 "arraysize.h", 294 "arraysize.h",
293 "asyncfile.cc", 295 "asyncfile.cc",
294 "asyncfile.h", 296 "asyncfile.h",
295 "asyncinvoker-inl.h", 297 "asyncinvoker-inl.h",
296 "asyncinvoker.cc", 298 "asyncinvoker.cc",
297 "asyncinvoker.h", 299 "asyncinvoker.h",
298 "asyncpacketsocket.cc", 300 "asyncpacketsocket.cc",
299 "asyncpacketsocket.h", 301 "asyncpacketsocket.h",
300 "asyncresolverinterface.cc", 302 "asyncresolverinterface.cc",
301 "asyncresolverinterface.h", 303 "asyncresolverinterface.h",
(...skipping 28 matching lines...) Expand all
330 "helpers.h", 332 "helpers.h",
331 "httpbase.cc", 333 "httpbase.cc",
332 "httpbase.h", 334 "httpbase.h",
333 "httpclient.cc", 335 "httpclient.cc",
334 "httpclient.h", 336 "httpclient.h",
335 "httpcommon-inl.h", 337 "httpcommon-inl.h",
336 "httpcommon.cc", 338 "httpcommon.cc",
337 "httpcommon.h", 339 "httpcommon.h",
338 "httprequest.cc", 340 "httprequest.cc",
339 "httprequest.h", 341 "httprequest.h",
342 "iosfilesystem.mm",
340 "ipaddress.cc", 343 "ipaddress.cc",
341 "ipaddress.h", 344 "ipaddress.h",
342 "linked_ptr.h", 345 "linked_ptr.h",
343 "messagedigest.cc", 346 "messagedigest.cc",
344 "messagedigest.h", 347 "messagedigest.h",
345 "messagehandler.cc", 348 "messagehandler.cc",
346 "messagehandler.h", 349 "messagehandler.h",
347 "messagequeue.cc", 350 "messagequeue.cc",
348 "messagequeue.h", 351 "messagequeue.h",
349 "nethelpers.cc", 352 "nethelpers.cc",
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 "unixfilesystem.h", 662 "unixfilesystem.h",
660 ] 663 ]
661 if (is_debug) { 664 if (is_debug) {
662 # The Chromium build/common.gypi defines this for all posix 665 # The Chromium build/common.gypi defines this for all posix
663 # _except_ for ios & mac. We want it there as well, e.g. 666 # _except_ for ios & mac. We want it there as well, e.g.
664 # because ASSERT and friends trigger off of it. 667 # because ASSERT and friends trigger off of it.
665 defines += [ "_DEBUG" ] 668 defines += [ "_DEBUG" ]
666 } 669 }
667 } 670 }
668 671
672 if (is_ios || (is_mac && current_cpu != "x86")) {
673 defines += [ "CARBON_DEPRECATED=YES" ]
674 }
675
669 if (is_linux || is_android) { 676 if (is_linux || is_android) {
670 sources += [ 677 sources += [
671 "linux.cc", 678 "linux.cc",
672 "linux.h", 679 "linux.h",
673 ] 680 ]
674 } 681 }
675 682
676 if (is_nacl) { 683 if (is_nacl) {
677 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 684 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
678 defines += [ "timezone=_timezone" ] 685 defines += [ "timezone=_timezone" ]
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 "java/src/org/webrtc/Logging.java", 754 "java/src/org/webrtc/Logging.java",
748 "java/src/org/webrtc/Size.java", 755 "java/src/org/webrtc/Size.java",
749 "java/src/org/webrtc/ThreadUtils.java", 756 "java/src/org/webrtc/ThreadUtils.java",
750 ] 757 ]
751 758
752 deps = [ 759 deps = [
753 "//base:base_java", 760 "//base:base_java",
754 ] 761 ]
755 } 762 }
756 } 763 }
OLDNEW
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/base/applefilesystem.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698