diff options
Diffstat (limited to 'www/chromium/patches/patch-net_BUILD_gn')
| -rw-r--r-- | www/chromium/patches/patch-net_BUILD_gn | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/www/chromium/patches/patch-net_BUILD_gn b/www/chromium/patches/patch-net_BUILD_gn deleted file mode 100644 index 3bca936..0000000 --- a/www/chromium/patches/patch-net_BUILD_gn +++ /dev/null | |||
| @@ -1,101 +0,0 @@ | |||
| 1 | Index: net/BUILD.gn | ||
| 2 | --- net/BUILD.gn.orig | ||
| 3 | +++ net/BUILD.gn | ||
| 4 | @@ -101,7 +101,7 @@ net_configs = [ | ||
| 5 | "//build/config/compiler:wexit_time_destructors", | ||
| 6 | ] | ||
| 7 | |||
| 8 | -if (is_linux || is_chromeos) { | ||
| 9 | +if ((is_linux || is_chromeos) && !is_bsd) { | ||
| 10 | net_configs += [ "//build/config/linux:libresolv" ] | ||
| 11 | } | ||
| 12 | |||
| 13 | @@ -1096,6 +1096,7 @@ component("net") { | ||
| 14 | "//net/dns:mdns_client", | ||
| 15 | "//net/dns/public", | ||
| 16 | "//net/third_party/quiche", | ||
| 17 | + "//sandbox/policy", | ||
| 18 | ] | ||
| 19 | |||
| 20 | allow_circular_includes_from = [ | ||
| 21 | @@ -1224,6 +1225,15 @@ component("net") { | ||
| 22 | ] | ||
| 23 | } | ||
| 24 | |||
| 25 | + if (is_bsd) { | ||
| 26 | + sources -= [ | ||
| 27 | + "base/address_tracker_linux.cc", | ||
| 28 | + "base/address_tracker_linux.h", | ||
| 29 | + "base/network_change_notifier_linux.cc", | ||
| 30 | + "base/network_interfaces_linux.cc", | ||
| 31 | + ] | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | if (is_mac) { | ||
| 35 | sources += [ | ||
| 36 | "base/network_notification_thread_mac.cc", | ||
| 37 | @@ -1356,7 +1366,7 @@ component("net") { | ||
| 38 | } | ||
| 39 | } | ||
| 40 | |||
| 41 | - if (is_android || is_chromeos_ash) { | ||
| 42 | + if (is_android || is_chromeos_ash || is_bsd) { | ||
| 43 | sources += [ | ||
| 44 | "base/network_change_notifier_posix.cc", | ||
| 45 | "base/network_change_notifier_posix.h", | ||
| 46 | @@ -1389,7 +1399,7 @@ component("net") { | ||
| 47 | } | ||
| 48 | |||
| 49 | # Use getifaddrs() on POSIX platforms, except Linux. | ||
| 50 | - if (is_posix && !is_linux && !is_chromeos) { | ||
| 51 | + if ((is_posix && !is_linux && !is_chromeos) || is_bsd) { | ||
| 52 | sources += [ | ||
| 53 | "base/network_interfaces_getifaddrs.cc", | ||
| 54 | "base/network_interfaces_getifaddrs.h", | ||
| 55 | @@ -2465,7 +2475,7 @@ if (is_linux || is_chromeos || is_mac) { | ||
| 56 | } | ||
| 57 | } | ||
| 58 | |||
| 59 | -if (is_linux || is_chromeos) { | ||
| 60 | +if ((is_linux || is_chromeos) && !is_bsd) { | ||
| 61 | static_library("epoll_server") { | ||
| 62 | sources = [ | ||
| 63 | "tools/epoll_server/platform/impl/epoll_bug_impl.h", | ||
| 64 | @@ -4459,7 +4469,7 @@ test("net_unittests") { | ||
| 65 | ] | ||
| 66 | } | ||
| 67 | |||
| 68 | - if (is_linux || is_chromeos) { | ||
| 69 | + if ((is_linux || is_chromeos) && !is_bsd) { | ||
| 70 | sources += [ | ||
| 71 | "base/address_tracker_linux_unittest.cc", | ||
| 72 | "base/network_interfaces_linux_unittest.cc", | ||
| 73 | @@ -4533,6 +4543,10 @@ test("net_unittests") { | ||
| 74 | "//url:buildflags", | ||
| 75 | ] | ||
| 76 | |||
| 77 | + if (is_bsd) { | ||
| 78 | + deps += [ "//sandbox/policy" ] | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] | ||
| 82 | |||
| 83 | if (enable_websockets) { | ||
| 84 | @@ -4580,7 +4594,7 @@ test("net_unittests") { | ||
| 85 | ] | ||
| 86 | } | ||
| 87 | |||
| 88 | - if (is_linux || is_chromeos) { | ||
| 89 | + if ((is_linux || is_chromeos) && !is_bsd) { | ||
| 90 | sources += [ | ||
| 91 | "quic/platform/impl/quic_epoll_clock_test.cc", | ||
| 92 | "quic/platform/impl/quic_flags_test.cc", | ||
| 93 | @@ -4728,7 +4742,7 @@ test("net_unittests") { | ||
| 94 | } | ||
| 95 | |||
| 96 | # Use getifaddrs() on POSIX platforms, except Linux. | ||
| 97 | - if (is_posix && !is_linux && !is_chromeos) { | ||
| 98 | + if (is_posix && !is_linux && !is_chromeos && !is_bsd) { | ||
| 99 | sources += [ "base/network_interfaces_getifaddrs_unittest.cc" ] | ||
| 100 | } | ||
| 101 | |||
