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

Unified Diff: chrome/chrome_common.gypi

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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 | « build/linux/system.gyp ('k') | chrome/chrome_utility.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2f7ccad6833297c1539b5e51bee47c3f8ae32f4e..7faa5e66468118749f6ae5a27a51e760611b6785 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -634,43 +634,31 @@
}, { # OS == ios
'sources!': [
'common/net/net_resource_provider.cc',
+ ],
+ }],
+ ['OS == "android" or OS == "ios"', {
+ 'sources!': [
'common/net/x509_certificate_model.cc',
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['use_openssl_certs == 1 and OS != "android"', {
'dependencies': [
- '../build/linux/system.gyp:ssl',
+ '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
],
- },
- ],
- ['os_posix != 1 or OS == "mac" or OS == "ios"', {
+ }, {
'sources!': [
- 'common/net/x509_certificate_model_nss.cc',
'common/net/x509_certificate_model_openssl.cc',
],
},
],
- ['OS == "android"', {
+ ['use_nss_certs == 1', {
'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- 'sources!': [
- 'common/net/x509_certificate_model.cc',
- 'common/net/x509_certificate_model_openssl.cc',
+ '../build/linux/system.gyp:ssl',
],
- }],
- ['use_openssl==1', {
+ }, {
'sources!': [
'common/net/x509_certificate_model_nss.cc',
],
- 'dependencies': [
- '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
- ],
- },
- { # else !use_openssl: remove the unneeded files
- 'sources!': [
- 'common/net/x509_certificate_model_openssl.cc',
- ],
},
],
['OS=="win"', {
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome_utility.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698