From bc6cc8e4c74dc081f6e8ad5b2a4ff2e229488e9a Mon Sep 17 00:00:00 2001 From: jam Date: Fri, 14 Nov 2014 09:56:29 -0800 Subject: [PATCH] Fix crypto and net build on Windows GN. Review URL: https://codereview.chromium.org/732613003 Cr-Commit-Position: refs/heads/master@{#304233} --- crypto/BUILD.gn | 5 +++++ net/BUILD.gn | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index f342af91a7f77d..dd4136ae33fd9c 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -124,6 +124,11 @@ component("crypto") { deps += [ "//third_party/android_tools:cpu_features" ] } + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] + } + if (use_openssl) { # Remove NSS files when using OpenSSL sources -= [ diff --git a/net/BUILD.gn b/net/BUILD.gn index 53c1ed990a0dae..1bb4b2c52e64cc 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -567,7 +567,10 @@ static_library("http_server") { "server/web_socket.cc", "server/web_socket.h", ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] + configs += [ + "//build/config/compiler:wexit_time_destructors", + ":net_win_size_truncation" + ] deps = [ ":net", "//base",