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

Unified Diff: components/components_tests.gyp

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/certificate_reporting/error_reporter_unittest.cc ('k') | components/gcm_driver.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 2039ad0c19f02c4cac1747a7dc39072f9897138d..c5588b20e3c19ee29684a57526dddee17a31b590 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1286,6 +1286,7 @@
'test_runner/test_runner.gyp:test_runner',
'tracing.gyp:tracing',
'webcrypto/webcrypto.gyp:webcrypto',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
'../third_party/re2/re2.gyp:re2',
],
'conditions': [
@@ -1304,24 +1305,6 @@
'components.gyp:policy_java',
],
}],
- ['use_openssl==1', {
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }, {
- 'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
- 'dependencies': [
- '../build/linux/system.gyp:ssl',
- ],
- }, {
- 'dependencies': [
- '../third_party/nss/nss.gyp:nspr',
- '../third_party/nss/nss.gyp:nss',
- ],
- }],
- ],
- }],
['safe_browsing == 2 and OS != "ios"', {
'dependencies': [
'components.gyp:safe_browsing_db_mobile',
« no previous file with comments | « components/certificate_reporting/error_reporter_unittest.cc ('k') | components/gcm_driver.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698