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

Unified Diff: runtime/bin/io_impl_sources.gypi

Issue 1811583003: Don't compile in root certs on Android. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Merge 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 | « no previous file | runtime/bin/root_certificates_unsupported.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 9f1fe1b9325d7770bcc07da804700f93994cac4d..c04cf7d23f17d5621e71b253401e8e3895e75907 100644
--- a/runtime/bin/io_impl_sources.gypi
+++ b/runtime/bin/io_impl_sources.gypi
@@ -43,6 +43,7 @@
'process_macos.cc',
'process_win.cc',
'../../third_party/root_certificates/root_certificates.cc',
+ 'root_certificates_unsupported.cc',
'secure_socket.h',
'secure_socket_boringssl.cc',
'secure_socket_boringssl.h',
@@ -76,17 +77,22 @@
'secure_socket_unsupported.cc',
],
'conditions': [
- ['OS=="mac"', {
+ ['dart_io_ssl_builtin_roots==0 or OS=="mac"', {
# On Mac, we use the system keystore, so do not compile in the
# root certs.
- 'sources!': [
+ 'sources!' : [
'../../third_party/root_certificates/root_certificates.cc',
],
+ }, { # else dart_io_ssl_builtin_roots == 1 and OS != mac.
+ 'sources!' : [
+ 'root_certificates_unsupported.cc',
+ ],
}],
],
}, { # else dart_io_secure_socket == 0
'sources!' : [
'../../third_party/root_certificates/root_certificates.cc',
+ 'root_certificates_unsupported.cc',
'io_service.cc',
'io_service.h',
'secure_socket.h',
@@ -110,6 +116,7 @@
'io_service_no_ssl.cc',
'io_service_no_ssl.h',
'../../third_party/root_certificates/root_certificates.cc',
+ 'root_certificates_unsupported.cc',
'secure_socket.h',
'secure_socket_boringssl.cc',
'secure_socket_boringssl.h',
« no previous file with comments | « no previous file | runtime/bin/root_certificates_unsupported.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698