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

Unified Diff: chrome/chrome_common.gypi

Issue 387753003: Add stub networking_private OpenSSL implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index cbd4ab1a87ebbc4747dc664145ae0f47e304f3a6..0359bcd600ccaf32579ec942fdaf69146f8c6616 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -339,7 +339,8 @@
}],
['OS=="win" or OS=="mac"', {
'sources': [
- 'common/extensions/api/networking_private/networking_private_crypto.cc',
+ 'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
+ 'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
'common/extensions/api/networking_private/networking_private_crypto.h',
'common/media_galleries/itunes_library.cc',
'common/media_galleries/itunes_library.h',
@@ -511,6 +512,17 @@
['safe_browsing==2', {
'defines': [ 'MOBILE_SAFE_BROWSING' ],
}],
+ ['use_openssl==1', {
+ 'sources!': [
+ 'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
+ ],
+ },
+ { # else !use_openssl
+ 'sources!': [
+ 'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
+ ],
+ },
+ ],
],
'target_conditions': [
['OS == "ios"', {
@@ -646,8 +658,6 @@
}],
['use_openssl==1', {
'sources!': [
- # networking_private_crypto.cc uses NSS functions.
- 'common/extensions/api/networking_private/networking_private_crypto.cc',
'common/net/x509_certificate_model_nss.cc',
],
},

Powered by Google App Engine
This is Rietveld 408576698