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

Unified Diff: chrome/chrome_common.gypi

Issue 396463004: Implement NetworkingPrivateCrypto for OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rsleevi comments 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 0359bcd600ccaf32579ec942fdaf69146f8c6616..8c7c5a97d8e46e9205011aa02359a5ce7a078a15 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -341,6 +341,7 @@
'sources': [
'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.cc',
Ryan Sleevi 2014/07/17 17:26:29 GN updates?
brettw 2014/07/17 19:44:38 Looks like this doesn't exist yet IN. I'll fill ou
davidben 2014/07/17 22:08:22 In the meantime, I've left this for now. Probably
'common/extensions/api/networking_private/networking_private_crypto.h',
'common/media_galleries/itunes_library.cc',
'common/media_galleries/itunes_library.h',
@@ -349,6 +350,12 @@
'common/media_galleries/pmp_constants.h',
],
}],
+ ['(OS=="win" or OS=="mac") and use_openssl==1', {
+ # networking_private_crypto_openssl.cc depends on openssl.
+ 'dependencies': [
+ '../third_party/openssl/openssl.gyp:openssl',
+ ],
+ }],
['OS=="mac"', {
'sources': [
'common/media_galleries/iphoto_library.cc',

Powered by Google App Engine
This is Rietveld 408576698