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

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: Fixing header ordering. 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
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 313d8b0d067d4b6706e3c9f8ce0cd325df738856..2487a1508950e488f68e10991e0250e9441f5056 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1281,6 +1281,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': [
@@ -1299,24 +1300,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',

Powered by Google App Engine
This is Rietveld 408576698