| Index: net/BUILD.gn
|
| diff --git a/net/BUILD.gn b/net/BUILD.gn
|
| index bac24505b1fadde4504327043c40b99571415a0f..23eadc841dc78299bf60a64c797951481f801537 100644
|
| --- a/net/BUILD.gn
|
| +++ b/net/BUILD.gn
|
| @@ -48,6 +48,9 @@ use_v8_in_net = false
|
| enable_built_in_dns = !is_ios
|
| disable_ftp_support = is_ios
|
|
|
| +# NOTE(vtl): This was "moved" from //build/config/features.gni.
|
| +enable_mdns = is_linux
|
| +
|
| declare_args() {
|
| # Disables support for file URLs. File URL support requires use of icu.
|
| disable_file_support = false
|
| @@ -289,11 +292,6 @@ component("net") {
|
| ]
|
| }
|
|
|
| - if (use_glib && !is_chromeos) {
|
| - configs += [ "//build/config/linux:gconf" ]
|
| - deps += [ "//build/config/linux:gio" ]
|
| - }
|
| -
|
| if (is_linux) {
|
| configs += [ "//build/config/linux:libresolv" ]
|
| }
|
| @@ -392,7 +390,8 @@ component("net") {
|
| ]
|
| }
|
|
|
| - if (!enable_mdns) {
|
| + # Was "!enable_mdns".
|
| + if (!is_linux) {
|
| sources -= [
|
| "dns/mdns_cache.cc",
|
| "dns/mdns_cache.h",
|
| @@ -569,9 +568,9 @@ executable("dump_cache") {
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
| deps = [
|
| - "//base",
|
| ":net",
|
| ":test_support",
|
| + "//base",
|
| ]
|
| }
|
|
|
| @@ -928,8 +927,8 @@ if (!is_ios && !is_android) {
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
| deps = [
|
| - "//base",
|
| ":net",
|
| + "//base",
|
| ]
|
| }
|
|
|
| @@ -942,8 +941,8 @@ if (!is_ios && !is_android) {
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
| deps = [
|
| - "//base",
|
| ":net",
|
| + "//base",
|
| ]
|
| }
|
|
|
| @@ -956,8 +955,8 @@ if (!is_ios && !is_android) {
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
| deps = [
|
| - "//base",
|
| ":net",
|
| + "//base",
|
| ]
|
| }
|
|
|
| @@ -991,7 +990,6 @@ if (!is_ios && !is_android) {
|
| deps = [
|
| ":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not
|
| # in the GYP build, and can be removed when the bug is fixed.
|
| -
|
| ":test_support",
|
| "//base",
|
| "//base/test:test_support",
|
| @@ -1100,8 +1098,8 @@ if (is_linux) {
|
| ":flip_in_mem_edsm_server_base",
|
| ":net",
|
| ":test_support",
|
| - "//testing/gtest",
|
| "//testing/gmock",
|
| + "//testing/gtest",
|
| "//third_party/boringssl",
|
| ]
|
| }
|
| @@ -1156,8 +1154,8 @@ if (is_linux) {
|
| ]
|
| deps = [
|
| ":balsa",
|
| - ":epoll_server",
|
| ":epoll_quic_tools",
|
| + ":epoll_server",
|
| ":net",
|
| ":simple_quic_tools",
|
| "//base",
|
| @@ -1171,8 +1169,8 @@ if (is_linux) {
|
| ]
|
| deps = [
|
| ":balsa",
|
| - ":epoll_server",
|
| ":epoll_quic_tools",
|
| + ":epoll_server",
|
| ":net",
|
| ":simple_quic_tools",
|
| "//base",
|
| @@ -1316,9 +1314,9 @@ if (!is_android && !is_mac) {
|
| sources += gypi_values.net_linux_test_sources
|
| deps += [
|
| ":balsa",
|
| + ":epoll_quic_tools",
|
| ":epoll_server",
|
| ":flip_in_mem_edsm_server_base",
|
| - ":epoll_quic_tools",
|
| ]
|
| }
|
|
|
| @@ -1586,13 +1584,13 @@ executable("net_perftests") {
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
| deps = [
|
| + ":net",
|
| + ":test_support",
|
| "//base",
|
| "//base:i18n",
|
| "//base/test:test_support_perf",
|
| "//testing/gtest",
|
| "//url",
|
| - ":net",
|
| - ":test_support",
|
| ]
|
|
|
| if (enable_websockets) {
|
|
|