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

Unified Diff: runtime/bin/io_impl_sources.gypi

Issue 1721283002: Implements secure sockets on Mac OS with SecureTransport API (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Address comments Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/bin/io_natives.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/io_impl_sources.gypi
diff --git a/runtime/bin/io_impl_sources.gypi b/runtime/bin/io_impl_sources.gypi
index 03d20d44900e519ee0631262633daadda6ec161d..9f1fe1b9325d7770bcc07da804700f93994cac4d 100644
--- a/runtime/bin/io_impl_sources.gypi
+++ b/runtime/bin/io_impl_sources.gypi
@@ -43,8 +43,11 @@
'process_macos.cc',
'process_win.cc',
'../../third_party/root_certificates/root_certificates.cc',
- 'secure_socket.cc',
'secure_socket.h',
+ 'secure_socket_boringssl.cc',
+ 'secure_socket_boringssl.h',
+ 'secure_socket_macos.cc',
+ 'secure_socket_macos.h',
'secure_socket_unsupported.cc',
'socket.cc',
'socket.h',
@@ -72,13 +75,25 @@
'io_service_no_ssl.h',
'secure_socket_unsupported.cc',
],
+ 'conditions': [
+ ['OS=="mac"', {
+ # On Mac, we use the system keystore, so do not compile in the
+ # root certs.
+ 'sources!': [
+ '../../third_party/root_certificates/root_certificates.cc',
+ ],
+ }],
+ ],
}, { # else dart_io_secure_socket == 0
'sources!' : [
'../../third_party/root_certificates/root_certificates.cc',
'io_service.cc',
'io_service.h',
- 'secure_socket.cc',
'secure_socket.h',
+ 'secure_socket_boringssl.cc',
+ 'secure_socket_boringssl.h',
+ 'secure_socket_macos.cc',
+ 'secure_socket_macos.h',
],
}],
],
@@ -95,8 +110,11 @@
'io_service_no_ssl.cc',
'io_service_no_ssl.h',
'../../third_party/root_certificates/root_certificates.cc',
- 'secure_socket.cc',
'secure_socket.h',
+ 'secure_socket_boringssl.cc',
+ 'secure_socket_boringssl.h',
+ 'secure_socket_macos.cc',
+ 'secure_socket_macos.h',
],
}],
],
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/bin/io_natives.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698