Index: net/BUILD.gn |
diff --git a/net/BUILD.gn b/net/BUILD.gn |
index 4935b6765732616601974e68565185b1ee3cad4c..0069f59e6260fa409ed0dcbdd925e14921108a85 100644 |
--- a/net/BUILD.gn |
+++ b/net/BUILD.gn |
@@ -61,14 +61,6 @@ config("net_config") { |
} |
} |
-# Disables Windows warning about size to int truncations. |
-# TODO(jschuh): crbug.com/167187 fix this and delete this config. |
-config("net_win_size_truncation") { |
- if (is_win) { |
- cflags = [ "/wd4267" ] |
- } |
-} |
- |
component("net") { |
sources = |
gypi_values.net_nacl_common_sources + gypi_values.net_non_nacl_sources |
@@ -83,7 +75,7 @@ component("net") { |
"DLOPEN_KERBEROS", |
"NET_IMPLEMENTATION", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
public_configs = [ ":net_config" ] |
include_dirs = [] |
@@ -569,7 +561,7 @@ static_library("http_server") { |
] |
configs += [ |
"//build/config/compiler:wexit_time_destructors", |
- ":net_win_size_truncation", |
+ "//build/config/compiler:no_size_t_to_int_warning", |
] |
deps = [ |
":net", |
@@ -593,7 +585,7 @@ executable("dump_cache") { |
"tools/dump_cache/url_utilities.h", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
"//base", |
@@ -691,7 +683,7 @@ source_set("test_support") { |
"url_request/url_request_test_util.h", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
public_deps = [ |
"//base", |
@@ -774,7 +766,7 @@ if (use_v8_in_net) { |
defines = [ "NET_IMPLEMENTATION" ] |
configs += [ |
- ":net_win_size_truncation", |
+ "//build/config/compiler:no_size_t_to_int_warning", |
"//build/config/compiler:wexit_time_destructors", |
] |
@@ -825,7 +817,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"tools/crash_cache/crash_cache.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
":net", |
":test_support", |
@@ -838,7 +830,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"tools/crl_set_dump/crl_set_dump.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
":net", |
"//base", |
@@ -850,7 +842,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"tools/dns_fuzz_stub/dns_fuzz_stub.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
":net", |
"//base", |
@@ -874,7 +866,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"tools/get_server_time/get_server_time.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
":net", |
"//base", |
@@ -883,6 +875,42 @@ if (!is_ios && !is_android) { |
] |
} |
+ executable("hpack_example_generator") { |
+ testonly = true |
+ sources = [ |
+ "spdy/fuzzing/hpack_example_generator.cc", |
+ ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ deps = [ |
+ "//base", |
+ ":net", |
+ ] |
+ } |
+ |
+ executable("hpack_fuzz_mutator") { |
+ testonly = true |
+ sources = [ |
+ "spdy/fuzzing/hpack_fuzz_mutator.cc", |
+ ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ deps = [ |
+ "//base", |
+ ":net", |
+ ] |
+ } |
+ |
+ executable("hpack_fuzz_wrapper") { |
+ testonly = true |
+ sources = [ |
+ "spdy/fuzzing/hpack_fuzz_wrapper.cc", |
+ ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ deps = [ |
+ "//base", |
+ ":net", |
+ ] |
+ } |
+ |
if (use_v8_in_net) { |
executable("net_watcher") { |
testonly = true |
@@ -925,7 +953,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"disk_cache/blockfile/stress_cache.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
":net", |
":test_support", |
@@ -937,7 +965,7 @@ if (!is_ios && !is_android) { |
sources = [ |
"tools/tld_cleanup/tld_cleanup.cc", |
] |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps = [ |
"//base", |
"//base:i18n", |
@@ -1161,7 +1189,7 @@ if (!is_android && !is_win && !is_mac) { |
test("net_unittests") { |
sources = gypi_values.net_test_sources |
- configs += [ ":net_win_size_truncation" ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
defines = [] |
deps = [ |
@@ -1453,3 +1481,39 @@ if (!is_android && !is_win && !is_mac) { |
] |
} |
} # !is_android && !is_win && !is_mac |
+ |
+executable("net_perftests") { |
+ testonly = true |
+ sources = [ |
+ "cookies/cookie_monster_perftest.cc", |
+ "disk_cache/blockfile/disk_cache_perftest.cc", |
+ "proxy/proxy_resolver_perftest.cc", |
+ "udp/udp_socket_perftest.cc", |
+ ] |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ deps = [ |
+ "//base", |
+ "//base:i18n", |
+ "//base/test:test_support_perf", |
+ "//testing/gtest", |
+ "//url", |
+ ":net", |
+ ":test_support", |
+ ] |
+ |
+ if (enable_websockets) { |
+ sources += [ "websockets/websocket_frame_perftest.cc" ] |
+ } |
+ |
+ if (use_v8_in_net) { |
+ deps += [ ":net_with_v8" ] |
+ } else { |
+ sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
+ } |
+ |
+ if (is_win && icu_use_data_file) { |
+ # This is needed to trigger the dll copy step on windows. |
+ # TODO(mark): Specifying this here shouldn't be necessary. |
+ deps += [ "//third_party/icu:icudata" ] |
+ } |
+} |