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

Unified Diff: runtime/bin/io_impl_sources.gypi

Issue 1319703002: Breaking Change: merge BoringSSL branch into master (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 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 9236ec744fe57566764370188cb6dc9904d4c975..611b458f5f6fd5d6039a064ee476a9b85b1c8cfb 100644
--- a/runtime/bin/io_impl_sources.gypi
+++ b/runtime/bin/io_impl_sources.gypi
@@ -26,9 +26,9 @@
'filter_unsupported.cc',
'io_service.cc',
'io_service.h',
+ 'io_service_no_ssl.cc',
+ 'io_service_no_ssl.h',
'io_service_unsupported.cc',
- 'net/nss_memio.cc',
- 'net/nss_memio.h',
'platform.cc',
'platform.h',
'platform_android.cc',
@@ -41,6 +41,7 @@
'process_linux.cc',
'process_macos.cc',
'process_win.cc',
+ '../../third_party/root_certificates/root_certificates.cc',
'secure_socket.cc',
'secure_socket.h',
'secure_socket_unsupported.cc',
@@ -62,12 +63,15 @@
'conditions': [
['dart_io_secure_socket==1', {
'sources!' : [
+ 'io_service_no_ssl.cc',
+ 'io_service_no_ssl.h',
'secure_socket_unsupported.cc',
],
}, { # else dart_io_secure_socket == 0
'sources!' : [
- 'net/nss_memio.cc',
- 'net/nss_memio.h',
+ '../../third_party/root_certificates/root_certificates.cc',
+ 'io_service.cc',
+ 'io_service.h',
'secure_socket.cc',
'secure_socket.h',
],
@@ -83,8 +87,9 @@
'filter.h',
'io_service.cc',
'io_service.h',
- 'net/nss_memio.cc',
- 'net/nss_memio.h',
+ 'io_service_no_ssl.cc',
+ 'io_service_no_ssl.h',
+ '../../third_party/root_certificates/root_certificates.cc',
'secure_socket.cc',
'secure_socket.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