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

Unified Diff: components/gcm_driver.gypi

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 | « components/components_tests.gyp ('k') | components/gcm_driver/crypto/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/gcm_driver.gypi
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi
index 042397fc216023327b01a666c3408c253b99987f..1531dd1b65ad11d1e970fbde9e9c44cfc23cf6a0 100644
--- a/components/gcm_driver.gypi
+++ b/components/gcm_driver.gypi
@@ -226,6 +226,7 @@
'../components/components.gyp:leveldb_proto',
'../crypto/crypto.gyp:crypto',
'../net/net.gyp:net',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
],
'include_dirs': [
'..',
@@ -240,29 +241,11 @@
'gcm_driver/crypto/gcm_key_store.h',
'gcm_driver/crypto/gcm_message_cryptographer.cc',
'gcm_driver/crypto/gcm_message_cryptographer.h',
- 'gcm_driver/crypto/gcm_message_cryptographer_nss.cc',
'gcm_driver/crypto/gcm_message_cryptographer_openssl.cc',
'gcm_driver/crypto/p256_key_util.cc',
'gcm_driver/crypto/p256_key_util.h',
- 'gcm_driver/crypto/p256_key_util_nss.cc',
'gcm_driver/crypto/p256_key_util_openssl.cc',
],
- 'conditions': [
- ['use_openssl==1', {
- 'sources!': [
- 'gcm_driver/crypto/gcm_message_cryptographer_nss.cc',
- 'gcm_driver/crypto/p256_key_util_nss.cc',
- ],
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }, {
- 'sources!': [
- 'gcm_driver/crypto/gcm_message_cryptographer_openssl.cc',
- 'gcm_driver/crypto/p256_key_util_openssl.cc',
- ],
- }],
- ],
},
{
# GN version: //components/gcm_driver/crypto/proto
« no previous file with comments | « components/components_tests.gyp ('k') | components/gcm_driver/crypto/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698