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

Side by Side Diff: net/BUILD.gn

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 | « mojo/services/surfaces/surfaces_impl.cc ('k') | net/PRESUBMIT.py » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//url/config.gni") 8 import("//url/config.gni")
9 9
10 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni. 10 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni.
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 "third_party/mozilla_security_manager/nsPKCS12Blob.h", 242 "third_party/mozilla_security_manager/nsPKCS12Blob.h",
243 ] 243 ]
244 } 244 }
245 if (is_ios) { 245 if (is_ios) {
246 # Always removed for !ios below. 246 # Always removed for !ios below.
247 sources -= [ 247 sources -= [
248 "cert/cert_verify_proc_nss.cc", 248 "cert/cert_verify_proc_nss.cc",
249 "cert/cert_verify_proc_nss.h", 249 "cert/cert_verify_proc_nss.h",
250 ] 250 ]
251 } 251 }
252 if (is_win) {
253 sources -= [
254 "cert/cert/sha256_legacy_support_nss_win.cc",
255 ]
256 }
252 } else { 257 } else {
253 sources -= [ 258 sources -= [
254 "base/crypto_module_openssl.cc", 259 "base/crypto_module_openssl.cc",
255 "cert/ct_log_verifier_openssl.cc", 260 "cert/ct_log_verifier_openssl.cc",
256 "cert/ct_objects_extractor_openssl.cc", 261 "cert/ct_objects_extractor_openssl.cc",
257 "cert/jwk_serializer_openssl.cc", 262 "cert/jwk_serializer_openssl.cc",
258 "cert/x509_util_openssl.cc", 263 "cert/x509_util_openssl.cc",
259 "cert/x509_util_openssl.h", 264 "cert/x509_util_openssl.h",
260 "quic/crypto/aead_base_decrypter_openssl.cc", 265 "quic/crypto/aead_base_decrypter_openssl.cc",
261 "quic/crypto/aead_base_encrypter_openssl.cc", 266 "quic/crypto/aead_base_encrypter_openssl.cc",
(...skipping 15 matching lines...) Expand all
277 "ssl/openssl_ssl_util.cc", 282 "ssl/openssl_ssl_util.cc",
278 "ssl/openssl_ssl_util.h", 283 "ssl/openssl_ssl_util.h",
279 ] 284 ]
280 if (is_mac) { 285 if (is_mac) {
281 sources -= [ 286 sources -= [
282 "ssl/openssl_platform_key_mac.cc", 287 "ssl/openssl_platform_key_mac.cc",
283 ] 288 ]
284 } 289 }
285 if (is_win) { 290 if (is_win) {
286 sources -= [ 291 sources -= [
292 "cert/cert/sha256_legacy_support_openssl_win.cc",
287 "ssl/openssl_platform_key_win.cc", 293 "ssl/openssl_platform_key_win.cc",
288 ] 294 ]
289 } 295 }
290 } 296 }
291 297
292 if (!use_openssl_certs) { 298 if (!use_openssl_certs) {
293 sources -= [ 299 sources -= [
294 "base/keygen_handler_openssl.cc", 300 "base/keygen_handler_openssl.cc",
295 "base/openssl_private_key_store.h", 301 "base/openssl_private_key_store.h",
296 "base/openssl_private_key_store_memory.cc", 302 "base/openssl_private_key_store_memory.cc",
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 sources = [ "quic/quic_server_bin.cc" ] 1386 sources = [ "quic/quic_server_bin.cc" ]
1381 deps = [ 1387 deps = [
1382 ":quic_tools", 1388 ":quic_tools",
1383 ":net", 1389 ":net",
1384 "//base", 1390 "//base",
1385 "//third_party/boringssl", 1391 "//third_party/boringssl",
1386 ] 1392 ]
1387 } 1393 }
1388 1394
1389 } # !is_android 1395 } # !is_android
OLDNEW
« no previous file with comments | « mojo/services/surfaces/surfaces_impl.cc ('k') | net/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698