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

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: Addressed comments, moved feature declatation to content Created 4 years, 11 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
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 brotli encoding, ICU, file, ftp, and websocket
463 # support stripped.
459 component("net_small") { 464 component("net_small") {
460 sources = net_shared_sources 465 sources = net_shared_sources
461 466
462 # Add back some sources that were otherwise filtered out. 467 # Add back some sources that were otherwise filtered out.
463 set_sources_assignment_filter([]) 468 set_sources_assignment_filter([])
464 sources += net_shared_unfiltered_sources 469 sources += net_shared_unfiltered_sources
465 set_sources_assignment_filter(sources_assignment_filter) 470 set_sources_assignment_filter(sources_assignment_filter)
466 471
467 cflags = [] 472 cflags = []
468 defines = [] 473 defines = []
469 configs += net_shared_configs 474 configs += net_shared_configs
470 public_configs = [ ":net_config" ] 475 public_configs = [ ":net_config" ]
471 476
472 public_deps = net_shared_public_deps + 477 public_deps = net_shared_public_deps +
473 [ "//url:url_lib_use_icu_alternatives_on_android" ] 478 [ "//url:url_lib_use_icu_alternatives_on_android" ]
474 deps = net_shared_deps + [ ":net_jni_headers" ] 479 deps = net_shared_deps + [ ":net_jni_headers" ]
475 480
476 defines += [ 481 defines += [
477 "DISABLE_FILE_SUPPORT", 482 "DISABLE_FILE_SUPPORT",
478 "DISABLE_FTP_SUPPORT", 483 "DISABLE_FTP_SUPPORT",
479 "USE_ICU_ALTERNATIVES_ON_ANDROID=1", 484 "USE_ICU_ALTERNATIVES_ON_ANDROID=1",
480 ] 485 ]
481 486
482 # Use ICU alternative on Android. 487 # Use ICU alternative on Android.
483 sources += [ 488 sources += [
484 "base/net_string_util_icu_alternatives_android.cc", 489 "base/net_string_util_icu_alternatives_android.cc",
485 "base/net_string_util_icu_alternatives_android.h", 490 "base/net_string_util_icu_alternatives_android.h",
486 ] 491 ]
492
493 # Disable Brotli support.
494 sources += [ "filter/brotli_filter_disabled.cc" ]
487 } 495 }
488 } 496 }
489 497
490 grit("net_resources") { 498 grit("net_resources") {
491 source = "base/net_resources.grd" 499 source = "base/net_resources.grd"
492 use_qualified_include = true 500 use_qualified_include = true
493 outputs = [ 501 outputs = [
494 "grit/net_resources.h", 502 "grit/net_resources.h",
495 "net_resources.pak", 503 "net_resources.pak",
496 ] 504 ]
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 if (enable_websockets) { 1718 if (enable_websockets) {
1711 sources += [ "websockets/websocket_frame_perftest.cc" ] 1719 sources += [ "websockets/websocket_frame_perftest.cc" ]
1712 } 1720 }
1713 1721
1714 if (use_v8_in_net) { 1722 if (use_v8_in_net) {
1715 deps += [ ":net_with_v8" ] 1723 deps += [ ":net_with_v8" ]
1716 } else { 1724 } else {
1717 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1725 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1718 } 1726 }
1719 } 1727 }
OLDNEW
« no previous file with comments | « content/public/common/content_features.cc ('k') | net/DEPS » ('j') | net/filter/brotli_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698