summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-net_BUILD.gn')
-rw-r--r--www/chromium/files/patch-net_BUILD.gn30
1 files changed, 10 insertions, 20 deletions
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 6f77c842a329..1550b8a60b3a 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig 2017-02-02 02:02:56 UTC
+--- net/BUILD.gn.orig 2017-03-09 20:04:35 UTC
+++ net/BUILD.gn
@@ -82,7 +82,7 @@ if (use_glib && use_gconf && !is_chromeo
net_configs += [ "//build/config/linux/gconf" ]
@@ -9,24 +9,14 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -153,6 +153,11 @@ component("net") {
- ]
- if (is_android) {
- sources -= [ "base/openssl_private_key_store_android.cc" ]
-+ } else if (is_bsd) {
-+ sources -= [
-+ "base/address_tracker_linux.cc",
-+ "base/address_tracker_linux.h",
-+ ]
- }
- } else {
- if (is_android) {
-@@ -278,6 +283,14 @@ component("net") {
+@@ -281,6 +281,16 @@ component("net") {
sources -= [ "disk_cache/blockfile/file_posix.cc" ]
}
+ if (is_bsd) {
+ sources -= [
++ "base/address_tracker_linux.cc",
++ "base/address_tracker_linux.h",
+ "base/network_change_notifier_linux.cc",
+ "base/network_change_notifier_linux.h",
+ "base/network_interfaces_linux.cc",
@@ -36,7 +26,7 @@
if (is_ios || is_mac) {
sources += gypi_values.net_base_mac_ios_sources
}
-@@ -966,7 +979,7 @@ if (!is_ios && !is_android) {
+@@ -962,7 +972,7 @@ if (!is_ios && !is_android) {
}
}
@@ -45,7 +35,7 @@
executable("cachetool") {
testonly = true
sources = [
-@@ -995,7 +1008,7 @@ if (is_linux || is_mac) {
+@@ -991,7 +1001,7 @@ if (is_linux || is_mac) {
}
}
@@ -54,7 +44,7 @@
static_library("epoll_server") {
sources = [
"tools/epoll_server/epoll_server.cc",
-@@ -1098,7 +1111,7 @@ if (is_android) {
+@@ -1095,7 +1105,7 @@ if (is_android) {
}
}
@@ -63,7 +53,7 @@
executable("disk_cache_memory_test") {
testonly = true
sources = [
-@@ -1276,7 +1289,7 @@ test("net_unittests") {
+@@ -1276,7 +1286,7 @@ test("net_unittests") {
"third_party/nist-pkits/",
]
@@ -72,7 +62,7 @@
deps += [
"//third_party/pyftpdlib/",
"//third_party/pywebsocket/",
-@@ -1299,7 +1312,7 @@ test("net_unittests") {
+@@ -1299,7 +1309,7 @@ test("net_unittests") {
if (is_desktop_linux) {
deps += [ ":epoll_quic_tools" ]
}
@@ -81,7 +71,7 @@
sources += gypi_values.net_linux_test_sources
deps += [
":epoll_quic_tools",
-@@ -1319,6 +1332,12 @@ test("net_unittests") {
+@@ -1319,6 +1329,12 @@ test("net_unittests") {
sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
}