Chromium Code Reviews| Index: net/BUILD.gn |
| diff --git a/net/BUILD.gn b/net/BUILD.gn |
| index 478634f32b2c692aeab6893bc64935b88c6a2f2a..0c3d66bc662283515ea7b60bfc2bcb54a01ddb42 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 |
| } |
| @@ -1338,6 +1347,7 @@ test("net_unittests") { |
| "//sql", |
| "//testing/gmock", |
| "//testing/gtest", |
| + "//third_party/brotli", |
| "//third_party/zlib", |
| "//url", |
| ] |
| @@ -1495,6 +1505,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", |
| @@ -1569,6 +1584,7 @@ test("net_unittests") { |
| "disk_cache/blockfile/block_files_unittest.cc", |
| # Need to read input data files. |
| + "filter/brotli_filter_unittest.cc", |
|
xunjieli
2015/11/17 16:16:12
The test file is already excluded on 1508. Isn't t
eustas
2015/11/17 17:57:21
Right you are. Fixed.
|
| "filter/gzip_filter_unittest.cc", |
| "socket/ssl_server_socket_unittest.cc", |
| "spdy/fuzzing/hpack_fuzz_util_test.cc", |