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

Side by Side Diff: net/BUILD.gn

Issue 1431723002: Add brotli content-encoding filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaseline Created 4 years, 12 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 | « chrome/browser/io_thread.cc ('k') | net/DEPS » ('j') | net/DEPS » ('J')
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/chromecast_build.gni") 5 import("//build/config/chromecast_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build_overrides/v8.gni") 10 import("//build_overrides/v8.gni")
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 # ICU support. 444 # ICU support.
445 deps += [ 445 deps += [
446 "//base:i18n", 446 "//base:i18n",
447 "//third_party/icu", 447 "//third_party/icu",
448 ] 448 ]
449 sources += [ 449 sources += [
450 "base/filename_util_icu.cc", 450 "base/filename_util_icu.cc",
451 "base/net_string_util_icu.cc", 451 "base/net_string_util_icu.cc",
452 "base/net_util_icu.cc", 452 "base/net_util_icu.cc",
453 ] 453 ]
454
455 # Brotli support.
456 deps += [ "//third_party/brotli" ]
457 sources += [ "filter/brotli_filter.cc" ]
454 } 458 }
455 } 459 }
456 460
457 if (is_android) { 461 if (is_android) {
458 # Same as net, but with ICU, file, ftp, and websocket support stripped. 462 # Same as net, but with ICU, file, ftp, and websocket support stripped.
Ryan Sleevi 2015/12/28 19:30:53 Update comment?
eustas 2015/12/29 13:15:38 Done.
459 component("net_small") { 463 component("net_small") {
460 sources = net_shared_sources 464 sources = net_shared_sources
461 465
462 # Add back some sources that were otherwise filtered out. 466 # Add back some sources that were otherwise filtered out.
463 set_sources_assignment_filter([]) 467 set_sources_assignment_filter([])
464 sources += net_shared_unfiltered_sources 468 sources += net_shared_unfiltered_sources
465 set_sources_assignment_filter(sources_assignment_filter) 469 set_sources_assignment_filter(sources_assignment_filter)
466 470
467 cflags = [] 471 cflags = []
468 defines = [] 472 defines = []
469 configs += net_shared_configs 473 configs += net_shared_configs
470 public_configs = [ ":net_config" ] 474 public_configs = [ ":net_config" ]
471 475
472 public_deps = net_shared_public_deps + 476 public_deps = net_shared_public_deps +
473 [ "//url:url_lib_use_icu_alternatives_on_android" ] 477 [ "//url:url_lib_use_icu_alternatives_on_android" ]
474 deps = net_shared_deps + [ ":net_jni_headers" ] 478 deps = net_shared_deps + [ ":net_jni_headers" ]
475 479
476 defines += [ 480 defines += [
477 "DISABLE_FILE_SUPPORT", 481 "DISABLE_FILE_SUPPORT",
478 "DISABLE_FTP_SUPPORT", 482 "DISABLE_FTP_SUPPORT",
479 "USE_ICU_ALTERNATIVES_ON_ANDROID=1", 483 "USE_ICU_ALTERNATIVES_ON_ANDROID=1",
480 ] 484 ]
481 485
482 # Use ICU alternative on Android. 486 # Use ICU alternative on Android.
483 sources += [ 487 sources += [
484 "base/net_string_util_icu_alternatives_android.cc", 488 "base/net_string_util_icu_alternatives_android.cc",
485 "base/net_string_util_icu_alternatives_android.h", 489 "base/net_string_util_icu_alternatives_android.h",
486 ] 490 ]
491
492 # Disable Brotli support.
493 sources += [ "filter/brotli_filter_disabled.cc" ]
487 } 494 }
488 } 495 }
489 496
490 grit("net_resources") { 497 grit("net_resources") {
491 source = "base/net_resources.grd" 498 source = "base/net_resources.grd"
492 use_qualified_include = true 499 use_qualified_include = true
493 outputs = [ 500 outputs = [
494 "grit/net_resources.h", 501 "grit/net_resources.h",
495 "net_resources.pak", 502 "net_resources.pak",
496 ] 503 ]
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 if (enable_websockets) { 1717 if (enable_websockets) {
1711 sources += [ "websockets/websocket_frame_perftest.cc" ] 1718 sources += [ "websockets/websocket_frame_perftest.cc" ]
1712 } 1719 }
1713 1720
1714 if (use_v8_in_net) { 1721 if (use_v8_in_net) {
1715 deps += [ ":net_with_v8" ] 1722 deps += [ ":net_with_v8" ]
1716 } else { 1723 } else {
1717 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1724 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1718 } 1725 }
1719 } 1726 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | net/DEPS » ('j') | net/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698