summaryrefslogtreecommitdiffstats
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.gn34
1 files changed, 16 insertions, 18 deletions
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 1550b8a..15c93a3 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig 2017-03-09 20:04:35 UTC
+--- net/BUILD.gn.orig 2017-04-19 19:06:36 UTC
+++ net/BUILD.gn
-@@ -82,7 +82,7 @@ if (use_glib && use_gconf && !is_chromeo
+@@ -79,7 +79,7 @@ if (use_glib && use_gconf && !is_chromeo
net_configs += [ "//build/config/linux/gconf" ]
}
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -281,6 +281,16 @@ component("net") {
+@@ -1824,6 +1824,16 @@ component("net") {
sources -= [ "disk_cache/blockfile/file_posix.cc" ]
}
@@ -24,9 +24,9 @@
+ }
+
if (is_ios || is_mac) {
- sources += gypi_values.net_base_mac_ios_sources
- }
-@@ -962,7 +972,7 @@ if (!is_ios && !is_android) {
+ sources += [
+ "base/mac/url_conversions.h",
+@@ -2773,7 +2783,7 @@ if (!is_ios && !is_android) {
}
}
@@ -35,7 +35,7 @@
executable("cachetool") {
testonly = true
sources = [
-@@ -991,7 +1001,7 @@ if (is_linux || is_mac) {
+@@ -2802,7 +2812,7 @@ if (is_linux || is_mac) {
}
}
@@ -44,7 +44,7 @@
static_library("epoll_server") {
sources = [
"tools/epoll_server/epoll_server.cc",
-@@ -1095,7 +1105,7 @@ if (is_android) {
+@@ -2906,7 +2916,7 @@ if (is_android) {
}
}
@@ -53,7 +53,7 @@
executable("disk_cache_memory_test") {
testonly = true
sources = [
-@@ -1276,7 +1286,7 @@ test("net_unittests") {
+@@ -4767,7 +4777,7 @@ test("net_unittests") {
"third_party/nist-pkits/",
]
@@ -62,25 +62,23 @@
deps += [
"//third_party/pyftpdlib/",
"//third_party/pywebsocket/",
-@@ -1299,7 +1309,7 @@ test("net_unittests") {
+@@ -4790,7 +4800,7 @@ test("net_unittests") {
if (is_desktop_linux) {
deps += [ ":epoll_quic_tools" ]
}
- if (is_linux) {
+ if (is_linux || is_bsd) {
- sources += gypi_values.net_linux_test_sources
- deps += [
- ":epoll_quic_tools",
-@@ -1319,6 +1329,12 @@ test("net_unittests") {
+ sources += [
+ "tools/quic/chlo_extractor_test.cc",
+ "tools/quic/end_to_end_test.cc",
+@@ -4852,6 +4862,10 @@ test("net_unittests") {
sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
}
+ if (is_bsd) {
-+ sources -= [
-+ "base/address_tracker_linux_unittest.cc",
-+ ]
++ sources -= [ "base/address_tracker_linux_unittest.cc" ]
+ }
+
- if (v8_use_external_startup_data) {
+ if (!is_proto_quic && v8_use_external_startup_data) {
deps += [ "//gin" ]
}
OpenPOWER on IntegriCloud