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

Side by Side Diff: net/net.gyp

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/http/partial_data.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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 'cert/cert_verify_proc_nss.h', 213 'cert/cert_verify_proc_nss.h',
214 'cert/ct_log_verifier_nss.cc', 214 'cert/ct_log_verifier_nss.cc',
215 'cert/ct_objects_extractor_nss.cc', 215 'cert/ct_objects_extractor_nss.cc',
216 'cert/jwk_serializer_nss.cc', 216 'cert/jwk_serializer_nss.cc',
217 'cert/nss_cert_database.cc', 217 'cert/nss_cert_database.cc',
218 'cert/nss_cert_database.h', 218 'cert/nss_cert_database.h',
219 'cert/nss_cert_database_chromeos.cc', 219 'cert/nss_cert_database_chromeos.cc',
220 'cert/nss_cert_database_chromeos.h', 220 'cert/nss_cert_database_chromeos.h',
221 'cert/nss_profile_filter_chromeos.cc', 221 'cert/nss_profile_filter_chromeos.cc',
222 'cert/nss_profile_filter_chromeos.h', 222 'cert/nss_profile_filter_chromeos.h',
223 'cert/sha256_legacy_support_nss_win.cc',
223 'cert/scoped_nss_types.h', 224 'cert/scoped_nss_types.h',
224 'cert/test_root_certs_nss.cc', 225 'cert/test_root_certs_nss.cc',
225 'cert/x509_certificate_nss.cc', 226 'cert/x509_certificate_nss.cc',
226 'cert/x509_util_nss.cc', 227 'cert/x509_util_nss.cc',
227 'cert/x509_util_nss.h', 228 'cert/x509_util_nss.h',
228 'ocsp/nss_ocsp.cc', 229 'ocsp/nss_ocsp.cc',
229 'ocsp/nss_ocsp.h', 230 'ocsp/nss_ocsp.h',
230 'quic/crypto/aead_base_decrypter_nss.cc', 231 'quic/crypto/aead_base_decrypter_nss.cc',
231 'quic/crypto/aead_base_encrypter_nss.cc', 232 'quic/crypto/aead_base_encrypter_nss.cc',
232 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 233 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
(...skipping 18 matching lines...) Expand all
251 'dependencies': [ 252 'dependencies': [
252 '../third_party/boringssl/boringssl.gyp:boringssl', 253 '../third_party/boringssl/boringssl.gyp:boringssl',
253 ], 254 ],
254 }, 255 },
255 { # else !use_openssl: remove the unneeded files and depend on NSS. 256 { # else !use_openssl: remove the unneeded files and depend on NSS.
256 'sources!': [ 257 'sources!': [
257 'base/crypto_module_openssl.cc', 258 'base/crypto_module_openssl.cc',
258 'cert/ct_log_verifier_openssl.cc', 259 'cert/ct_log_verifier_openssl.cc',
259 'cert/ct_objects_extractor_openssl.cc', 260 'cert/ct_objects_extractor_openssl.cc',
260 'cert/jwk_serializer_openssl.cc', 261 'cert/jwk_serializer_openssl.cc',
262 'cert/sha256_legacy_support_openssl_win.cc',
261 'cert/x509_util_openssl.cc', 263 'cert/x509_util_openssl.cc',
262 'cert/x509_util_openssl.h', 264 'cert/x509_util_openssl.h',
263 'crypto/scoped_openssl_types.h', 265 'crypto/scoped_openssl_types.h',
264 'quic/crypto/aead_base_decrypter_openssl.cc', 266 'quic/crypto/aead_base_decrypter_openssl.cc',
265 'quic/crypto/aead_base_encrypter_openssl.cc', 267 'quic/crypto/aead_base_encrypter_openssl.cc',
266 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 268 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
267 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 269 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
268 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', 270 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
269 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 271 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
270 'quic/crypto/channel_id_openssl.cc', 272 'quic/crypto/channel_id_openssl.cc',
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 '../build/isolate.gypi', 1707 '../build/isolate.gypi',
1706 ], 1708 ],
1707 'sources': [ 1709 'sources': [
1708 'net_unittests.isolate', 1710 'net_unittests.isolate',
1709 ], 1711 ],
1710 }, 1712 },
1711 ], 1713 ],
1712 }], 1714 }],
1713 ], 1715 ],
1714 } 1716 }
OLDNEW
« no previous file with comments | « net/http/partial_data.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698