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

Unified Diff: build/all.gyp

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing unused test code' 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 | « no previous file | build/android/pylib/utils/isolator.py » ('j') | build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 95d92562ca36fa8c338e9122fcc8b8aaf146a42f..46d59d9edfb4831cedcf94d7e16d653aea5df36b 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -30,6 +30,7 @@
'../sql/sql.gyp:*',
'../testing/gmock.gyp:*',
'../testing/gtest.gyp:*',
+ '../third_party/boringssl/boringssl.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libxml/libxml.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
@@ -167,11 +168,6 @@
'<(libjpeg_gyp_path):*',
],
}],
- ['use_openssl==0 and OS=="ios"', {
- 'dependencies': [
- '../third_party/nss/nss.gyp:*',
- ],
- }],
['OS=="win" or OS=="ios" or OS=="linux"', {
'dependencies': [
'../breakpad/breakpad.gyp:*',
@@ -254,17 +250,7 @@
'../remoting/remoting_all.gyp:remoting_all',
],
}],
- ['use_openssl==0', {
- 'dependencies': [
- '../net/third_party/nss/ssl.gyp:*',
- ],
- }],
- ['use_openssl==1', {
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:*',
- ],
- }],
- ['use_openssl==1 and OS!="ios"', {
+ ['OS!="ios"', {
'dependencies': [
'../third_party/boringssl/boringssl_tests.gyp:*',
],
« no previous file with comments | « no previous file | build/android/pylib/utils/isolator.py » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698