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

Unified Diff: net/BUILD.gn

Issue 1431723002: Add brotli content-encoding filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix histograms.xml Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet.gypi ('k') | net/DEPS » ('j') | net/filter/brotli_filter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 7963a0a0cfb4b69422a84ae887b9766a5ec22132..e8d98f5d3e6e4e6e415b2cd7eff474104873c064 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -41,6 +41,7 @@ posix_avoid_mmap = is_android && current_cpu != "x86"
enable_websockets = !is_ios
use_v8_in_net = !is_ios
enable_built_in_dns = !is_ios
+disable_brotli_support = is_ios
disable_ftp_support = is_ios
declare_args() {
@@ -121,6 +122,10 @@ if (!is_nacl) {
"//third_party/zlib",
]
+ if (!disable_brotli_support) {
+ net_shared_deps += [ "//third_party/brotli" ]
+ }
+
if (!use_kerberos) {
net_shared_sources -= [
"http/http_auth_gssapi_posix.cc",
@@ -419,6 +424,10 @@ component("net") {
sources += gypi_values.net_ftp_support_sources
}
+ if (!disable_brotli_support) {
+ sources += gypi_values.net_brotli_support_sources
+ }
+
if (enable_websockets) {
sources += gypi_values.net_websockets_sources
}
@@ -1353,6 +1362,7 @@ test("net_unittests") {
"//sql",
"//testing/gmock",
"//testing/gtest",
+ "//third_party/brotli",
"//third_party/zlib",
"//url",
]
@@ -1510,6 +1520,11 @@ test("net_unittests") {
]
}
+ if (disable_brotli_support) {
+ sources -= [ "filter/brotli_filter_unittest.cc" ]
+ deps -= [ "//third_party/brotli" ]
+ }
+
if (!enable_built_in_dns) {
sources -= [
"dns/address_sorter_posix_unittest.cc",
@@ -1584,6 +1599,7 @@ test("net_unittests") {
"disk_cache/blockfile/block_files_unittest.cc",
# Need to read input data files.
+ "filter/brotli_filter_unittest.cc",
"filter/gzip_filter_unittest.cc",
"socket/ssl_server_socket_unittest.cc",
"spdy/fuzzing/hpack_fuzz_util_test.cc",
« no previous file with comments | « components/cronet.gypi ('k') | net/DEPS » ('j') | net/filter/brotli_filter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698