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

Side by Side Diff: net/net.gyp

Issue 1070893002: Move net/ocsp/* into net/cert_net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_fetcher
Patch Set: undo header re-ordering -- seems to be breaking compile Created 5 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 unified diff | Download patch
« no previous file with comments | « net/cert_net/nss_ocsp_unittest.cc ('k') | net/net.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 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 'http/http_auth_gssapi_posix_unittest.cc', 226 'http/http_auth_gssapi_posix_unittest.cc',
227 'http/http_auth_handler_negotiate_unittest.cc', 227 'http/http_auth_handler_negotiate_unittest.cc',
228 'http/mock_gssapi_library_posix.cc', 228 'http/mock_gssapi_library_posix.cc',
229 'http/mock_gssapi_library_posix.h', 229 'http/mock_gssapi_library_posix.h',
230 ], 230 ],
231 }], 231 }],
232 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != " ios")', { 232 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != " ios")', {
233 # Only include this test when on Posix and using NSS for 233 # Only include this test when on Posix and using NSS for
234 # cert verification or on iOS (which also uses NSS for certs). 234 # cert verification or on iOS (which also uses NSS for certs).
235 'sources!': [ 235 'sources!': [
236 'ocsp/nss_ocsp_unittest.cc', 236 'cert_net/nss_ocsp_unittest.cc',
237 ], 237 ],
238 }], 238 }],
239 [ 'use_openssl==1', { 239 [ 'use_openssl==1', {
240 # When building for OpenSSL, we need to exclude NSS specific tests 240 # When building for OpenSSL, we need to exclude NSS specific tests
241 # or functionality not supported by OpenSSL yet. 241 # or functionality not supported by OpenSSL yet.
242 # TODO(bulach): Add equivalent tests when the underlying 242 # TODO(bulach): Add equivalent tests when the underlying
243 # functionality is ported to OpenSSL. 243 # functionality is ported to OpenSSL.
244 'sources!': [ 244 'sources!': [
245 'cert/nss_cert_database_chromeos_unittest.cc', 245 'cert/nss_cert_database_chromeos_unittest.cc',
246 'cert/nss_cert_database_unittest.cc', 246 'cert/nss_cert_database_unittest.cc',
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1531 '../build/isolate.gypi', 1531 '../build/isolate.gypi',
1532 ], 1532 ],
1533 'sources': [ 1533 'sources': [
1534 'net_unittests.isolate', 1534 'net_unittests.isolate',
1535 ], 1535 ],
1536 }, 1536 },
1537 ], 1537 ],
1538 }], 1538 }],
1539 ], 1539 ],
1540 } 1540 }
OLDNEW
« no previous file with comments | « net/cert_net/nss_ocsp_unittest.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698