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

Side by Side Diff: net/net.gyp

Issue 1918303002: Renaming system.gyp:ssl to system.gyp:nss and removing unused BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « crypto/crypto.gyp ('k') | net/net_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 'cert/nss_cert_database_unittest.cc', 217 'cert/nss_cert_database_unittest.cc',
218 'cert/nss_cert_database_chromeos_unittest.cc', 218 'cert/nss_cert_database_chromeos_unittest.cc',
219 'cert/nss_profile_filter_chromeos_unittest.cc', 219 'cert/nss_profile_filter_chromeos_unittest.cc',
220 'ssl/client_cert_store_nss_unittest.cc', 220 'ssl/client_cert_store_nss_unittest.cc',
221 ], 221 ],
222 }], 222 }],
223 [ 'use_nss_certs == 1', { 223 [ 'use_nss_certs == 1', {
224 'conditions': [ 224 'conditions': [
225 [ 'desktop_linux == 1 or chromeos == 1', { 225 [ 'desktop_linux == 1 or chromeos == 1', {
226 'dependencies': [ 226 'dependencies': [
227 '../build/linux/system.gyp:ssl', 227 '../build/linux/system.gyp:nss',
228 ], 228 ],
229 }, { # desktop_linux == 0 and chromeos == 0 229 }, { # desktop_linux == 0 and chromeos == 0
230 'dependencies': [ 230 'dependencies': [
231 '../third_party/nss/nss.gyp:nspr', 231 '../third_party/nss/nss.gyp:nspr',
232 '../third_party/nss/nss.gyp:nss', 232 '../third_party/nss/nss.gyp:nss',
233 'third_party/nss/ssl.gyp:libssl', 233 'third_party/nss/ssl.gyp:libssl',
234 ], 234 ],
235 }], 235 }],
236 ], 236 ],
237 }], 237 }],
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 'test/spawned_test_server/local_test_server.h', 649 'test/spawned_test_server/local_test_server.h',
650 'test/spawned_test_server/local_test_server_posix.cc', 650 'test/spawned_test_server/local_test_server_posix.cc',
651 'test/spawned_test_server/local_test_server_win.cc', 651 'test/spawned_test_server/local_test_server_win.cc',
652 'test/spawned_test_server/spawned_test_server.h', 652 'test/spawned_test_server/spawned_test_server.h',
653 ], 653 ],
654 }], 654 }],
655 ['use_nss_certs == 1', { 655 ['use_nss_certs == 1', {
656 'conditions': [ 656 'conditions': [
657 [ 'desktop_linux == 1 or chromeos == 1', { 657 [ 'desktop_linux == 1 or chromeos == 1', {
658 'dependencies': [ 658 'dependencies': [
659 '../build/linux/system.gyp:ssl', 659 '../build/linux/system.gyp:nss',
660 ], 660 ],
661 }, { # desktop_linux == 0 and chromeos == 0 661 }, { # desktop_linux == 0 and chromeos == 0
662 'dependencies': [ 662 'dependencies': [
663 '../third_party/nss/nss.gyp:nspr', 663 '../third_party/nss/nss.gyp:nspr',
664 '../third_party/nss/nss.gyp:nss', 664 '../third_party/nss/nss.gyp:nss',
665 'third_party/nss/ssl.gyp:libssl', 665 'third_party/nss/ssl.gyp:libssl',
666 ], 666 ],
667 }], 667 }],
668 ], 668 ],
669 }], 669 }],
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 '../build/isolate.gypi', 1711 '../build/isolate.gypi',
1712 ], 1712 ],
1713 'sources': [ 1713 'sources': [
1714 'net_unittests.isolate', 1714 'net_unittests.isolate',
1715 ], 1715 ],
1716 }, 1716 },
1717 ], 1717 ],
1718 }], 1718 }],
1719 ], 1719 ],
1720 } 1720 }
OLDNEW
« no previous file with comments | « crypto/crypto.gyp ('k') | net/net_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698