diff options
Diffstat (limited to 'www/chromium/files/patch-net_BUILD.gn')
-rw-r--r-- | www/chromium/files/patch-net_BUILD.gn | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 15c93a3..b43115e 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-04-19 19:06:36 UTC +--- net/BUILD.gn.orig 2017-06-05 19:03:09 UTC +++ net/BUILD.gn -@@ -79,7 +79,7 @@ if (use_glib && use_gconf && !is_chromeo +@@ -86,7 +86,7 @@ if (use_glib && use_gconf && !is_chromeos) { net_configs += [ "//build/config/linux/gconf" ] } @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1824,6 +1824,16 @@ component("net") { +@@ -1900,6 +1900,16 @@ component("net") { sources -= [ "disk_cache/blockfile/file_posix.cc" ] } @@ -26,7 +26,7 @@ if (is_ios || is_mac) { sources += [ "base/mac/url_conversions.h", -@@ -2773,7 +2783,7 @@ if (!is_ios && !is_android) { +@@ -2854,7 +2864,7 @@ if (!is_ios && !is_android) { } } @@ -35,7 +35,7 @@ executable("cachetool") { testonly = true sources = [ -@@ -2802,7 +2812,7 @@ if (is_linux || is_mac) { +@@ -2883,7 +2893,7 @@ if (is_linux || is_mac) { } } @@ -44,7 +44,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/epoll_server.cc", -@@ -2906,7 +2916,7 @@ if (is_android) { +@@ -2987,7 +2997,7 @@ if (is_android) { } } @@ -53,7 +53,7 @@ executable("disk_cache_memory_test") { testonly = true sources = [ -@@ -4767,7 +4777,7 @@ test("net_unittests") { +@@ -4874,7 +4884,7 @@ test("net_unittests") { "third_party/nist-pkits/", ] @@ -62,7 +62,7 @@ deps += [ "//third_party/pyftpdlib/", "//third_party/pywebsocket/", -@@ -4790,7 +4800,7 @@ test("net_unittests") { +@@ -4897,7 +4907,7 @@ test("net_unittests") { if (is_desktop_linux) { deps += [ ":epoll_quic_tools" ] } @@ -71,14 +71,14 @@ 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" ] - } +@@ -4957,6 +4967,10 @@ test("net_unittests") { -+ if (is_bsd) { -+ sources -= [ "base/address_tracker_linux_unittest.cc" ] + if (is_chromeos) { + sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] + } + - if (!is_proto_quic && v8_use_external_startup_data) { - deps += [ "//gin" ] ++ if (is_bsd) { ++ sources -= [ "base/address_tracker_linux_unittest.cc" ] } + + if (!is_proto_quic && v8_use_external_startup_data) { |