diff options
64 files changed, 221 insertions, 322 deletions
diff --git a/apps/BUILD.gn b/apps/BUILD.gn index 3bffcf5..5c409c2 100644 --- a/apps/BUILD.gn +++ b/apps/BUILD.gn @@ -69,8 +69,6 @@ static_library("apps") { ] } - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } diff --git a/ash/BUILD.gn b/ash/BUILD.gn index f6f0eb9..ed34a59 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -62,7 +62,7 @@ component("ash") { ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } if (use_x11) { @@ -314,9 +314,7 @@ test("ash_unittests") { ] } - if (is_win) { - cflags = [ "/wd4267" ] - } + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] if (!use_x11) { sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] diff --git a/base/BUILD.gn b/base/BUILD.gn index e417681..3c77dad 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -869,7 +869,7 @@ component("base") { ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] libs = [ "cfgmgr32.lib", @@ -1028,10 +1028,8 @@ component("i18n") { configs += [ "//build/config/compiler:optimize_max" ] } - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } source_set("prefs") { @@ -1439,10 +1437,8 @@ test("base_unittests") { set_sources_assignment_filter(sources_assignment_filter) } - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } if (is_android) { diff --git a/build/secondary/third_party/cacheinvalidation/BUILD.gn b/build/secondary/third_party/cacheinvalidation/BUILD.gn index 088f89a..feb93d74 100644 --- a/build/secondary/third_party/cacheinvalidation/BUILD.gn +++ b/build/secondary/third_party/cacheinvalidation/BUILD.gn @@ -77,17 +77,14 @@ static_library("cacheinvalidation") { "src/google/cacheinvalidation/include/types.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_configs = [ ":cacheinvalidation_config" ] deps = [ "src/google/cacheinvalidation:cacheinvalidation_proto_cpp", "//base", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } test("cacheinvalidation_unittests") { diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn index 768a85d..1786dc1 100644 --- a/build/secondary/third_party/nss/BUILD.gn +++ b/build/secondary/third_party/nss/BUILD.gn @@ -217,7 +217,10 @@ if (is_linux) { "//build/config/win:lean_and_mean", # Won"t compile with lean and mean. ] } - configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//build/config/compiler:no_size_t_to_int_warning", + ] cflags = [] defines = [ @@ -230,7 +233,6 @@ if (is_linux) { if (is_win) { cflags = [ "/wd4554", # Check precidence. - "/wd4267", # Conversion from size_t to "type". ] defines += [ "XP_PC", @@ -882,7 +884,10 @@ if (is_linux) { if (is_win) { configs -= [ "//build/config/win:unicode" ] # Requires 8-bit mode. } - configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//build/config/compiler:no_size_t_to_int_warning", + ] public_configs = [ ":nss_static_config" ] cflags = [] @@ -903,7 +908,6 @@ if (is_linux) { if (is_win) { cflags += [ "/wd4101", # Unreferenced local variable. - "/wd4267", # Conversion from size_t to "type". ] } diff --git a/cc/BUILD.gn b/cc/BUILD.gn index b97bb6c..5fb0909 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn @@ -536,10 +536,8 @@ component("cc") { "trees/tree_synchronizer.h", ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] # size_t -> int - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_deps = [ "//skia", diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn index e1edca7..a7580cb 100644 --- a/chrome/browser/devtools/BUILD.gn +++ b/chrome/browser/devtools/BUILD.gn @@ -47,11 +47,8 @@ static_library("devtools") { ] sources += get_target_outputs(":devtools_protocol_constants") - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } configs += [ + "//build/config/compiler:no_size_t_to_int_warning", "//build/config/compiler:wexit_time_destructors", "//third_party/WebKit/public:debug_devtools", ] diff --git a/chrome/common/net/BUILD.gn b/chrome/common/net/BUILD.gn index 0794d86..b69512c 100644 --- a/chrome/common/net/BUILD.gn +++ b/chrome/common/net/BUILD.gn @@ -57,7 +57,5 @@ static_library("net") { deps += [ "//third_party/boringssl" ] } - if (is_win) { - cflags = [ "/wd4267" ] - } + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn index a73f920..8dca7ce 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn @@ -66,7 +66,7 @@ static_library("util") { include_dirs = [ "$root_gen_dir/installer_util_strings" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] # TODO(GYP) hook up corresponding version of installer_util_nacl_win64 in GN sources += [ diff --git a/components/autofill/content/renderer/BUILD.gn b/components/autofill/content/renderer/BUILD.gn index 89706ab..bd0c7b2 100644 --- a/components/autofill/content/renderer/BUILD.gn +++ b/components/autofill/content/renderer/BUILD.gn @@ -38,8 +38,6 @@ static_library("renderer") { "//ui/base", ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn index dd040a0..5c937b0 100644 --- a/components/autofill/core/browser/BUILD.gn +++ b/components/autofill/core/browser/BUILD.gn @@ -175,6 +175,7 @@ static_library("browser") { "//url", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_configs = [ ":autofill_browser_config" ] if (autofill_enable_sync) { @@ -189,11 +190,6 @@ static_library("browser") { "webdata/autofill_wallet_syncable_service.h", ] } - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } static_library("test_support") { diff --git a/components/keyed_service/content/BUILD.gn b/components/keyed_service/content/BUILD.gn index b75f864..6d3d5b6 100644 --- a/components/keyed_service/content/BUILD.gn +++ b/components/keyed_service/content/BUILD.gn @@ -19,11 +19,10 @@ component("content") { "refcounted_browser_context_keyed_service_factory.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "KEYED_SERVICE_IMPLEMENTATION" ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } deps = [ "//base", diff --git a/components/keyed_service/core/BUILD.gn b/components/keyed_service/core/BUILD.gn index 2d8670e..8585cbb 100644 --- a/components/keyed_service/core/BUILD.gn +++ b/components/keyed_service/core/BUILD.gn @@ -26,14 +26,11 @@ component("core") { "service_access_types.h", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "KEYED_SERVICE_IMPLEMENTATION" ] deps = [ "//base", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } diff --git a/components/packed_ct_ev_whitelist/BUILD.gn b/components/packed_ct_ev_whitelist/BUILD.gn index ae9561e..c3ca36c 100644 --- a/components/packed_ct_ev_whitelist/BUILD.gn +++ b/components/packed_ct_ev_whitelist/BUILD.gn @@ -10,16 +10,13 @@ static_library("packed_ct_ev_whitelist") { "packed_ct_ev_whitelist.h", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//content", "//net", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } source_set("unit_tests") { diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn index d6601bf..3d06f74 100644 --- a/components/password_manager/core/browser/BUILD.gn +++ b/components/password_manager/core/browser/BUILD.gn @@ -99,11 +99,10 @@ static_library("browser") { # TODO(blundell): Provide the iOS login DB implementation and then # also exclude the POSIX one from iOS. http://crbug.com/341429 sources -= [ "login_database_posix.cc" ] - } else if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_configs = [ ":password_manager_config" ] # Sync (not supported in Android WebView). diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn index 3ec8040..3a1554e 100644 --- a/components/pdf/renderer/BUILD.gn +++ b/components/pdf/renderer/BUILD.gn @@ -14,6 +14,9 @@ static_library("renderer") { "ppb_pdf_impl.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//components/pdf/common", @@ -26,8 +29,4 @@ static_library("renderer") { "//v8", "//third_party/WebKit/public:blink_minimal", ] - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } diff --git a/components/printing/renderer/BUILD.gn b/components/printing/renderer/BUILD.gn index 768c95b..c31bb8e 100644 --- a/components/printing/renderer/BUILD.gn +++ b/components/printing/renderer/BUILD.gn @@ -12,6 +12,9 @@ static_library("printing_renderer") { "print_web_view_helper_pdf_win.cc", ] + # TODO(dgn): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//components/printing/common:printing_common", @@ -23,9 +26,4 @@ static_library("printing_renderer") { "//third_party/WebKit/public:blink", "//ui/base", ] - - if (is_win) { - # TODO(dgn): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn index 4f4f776..819b418 100644 --- a/components/signin/core/browser/BUILD.gn +++ b/components/signin/core/browser/BUILD.gn @@ -43,6 +43,8 @@ static_library("browser") { "webdata/token_web_data.h", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//crypto", @@ -67,11 +69,6 @@ static_library("browser") { if (is_chromeos) { sources -= [ "signin_manager.cc" ] } - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } static_library("test_support") { diff --git a/components/url_fixer/BUILD.gn b/components/url_fixer/BUILD.gn index bf29f35..93eac1f3 100644 --- a/components/url_fixer/BUILD.gn +++ b/components/url_fixer/BUILD.gn @@ -8,13 +8,11 @@ static_library("url_fixer") { "url_fixer.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//net", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 338c565..b0f6e1b 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -225,6 +225,9 @@ static_library("content_shell_lib") { "renderer/test_runner/web_test_runner.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "CONTENT_SHELL_VERSION=\"$content_shell_version\"" ] public_deps = [ @@ -280,9 +283,6 @@ static_library("content_shell_lib") { if (is_win) { #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP) - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] sources += [ "common/v8_breakpad_support_win.cc", "common/v8_breakpad_support_win.h", diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn index d277eb9e..f479ea9 100644 --- a/courgette/BUILD.gn +++ b/courgette/BUILD.gn @@ -107,10 +107,8 @@ test("courgette_unittests") { "third_party/paged_array_unittest.cc", ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":courgette_lib", diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index f6c45aa..d717197 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -93,6 +93,9 @@ component("crypto") { "third_party/nss/sha512.cc", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":platform", "//base", @@ -126,11 +129,6 @@ 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/extensions/BUILD.gn b/extensions/BUILD.gn index b1e69d27..202469a 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -70,6 +70,8 @@ source_set("test_support") { sources = rebase_path(extensions_gypi_values.extensions_test_support_sources, ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":extensions_resources", @@ -90,10 +92,6 @@ source_set("test_support") { "//content/public/browser", "//extensions/common/api/cast_channel:cast_channel_proto", ] - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn index a2b49b8..4659457 100644 --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn @@ -30,6 +30,9 @@ source_set("browser") { "//third_party/re2", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + if (enable_extensions) { # Includes all API implementations and the ExtensionsApiClient # interface. Moving an API from src/chrome to src/extensions implies @@ -97,8 +100,4 @@ source_set("browser") { } } } - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index faa1cb8..3cd8117 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -13,10 +13,8 @@ source_set("common_constants") { rebase_path(extensions_gypi_values.extensions_common_constants_sources, ".", "//extensions") - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } if (enable_extensions) { @@ -31,6 +29,8 @@ if (enable_extensions) { sources = rebase_path(extensions_gypi_values.extensions_common_sources, ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":common_constants", @@ -81,9 +81,5 @@ if (enable_extensions) { "//extensions") sources += nacl_sources } - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } } # enable_extensions diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index a35e723..1bfceef 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -13,6 +13,9 @@ source_set("renderer") { ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//chrome:resources", "//content:resources", @@ -22,8 +25,4 @@ source_set("renderer") { "//third_party/WebKit/public:blink", "//third_party/mojo/src/mojo/edk/js", ] - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } diff --git a/extensions/utility/BUILD.gn b/extensions/utility/BUILD.gn index 1662c08..52f9d83 100644 --- a/extensions/utility/BUILD.gn +++ b/extensions/utility/BUILD.gn @@ -13,13 +13,12 @@ source_set("utility") { ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//content/public/utility", "//extensions/common", "//skia", ] - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } } diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn index 9d10b9e..1cdf686 100644 --- a/google_apis/BUILD.gn +++ b/google_apis/BUILD.gn @@ -122,11 +122,10 @@ source_set("google_apis") { "google_api_keys.h", ] - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int - } - - configs += [ ":key_defines" ] + configs += [ + ":key_defines", + "//build/config/compiler:no_size_t_to_int_warning", + ] deps = [ "//base", diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn index 464061c..7d08ba11 100644 --- a/gpu/blink/BUILD.gn +++ b/gpu/blink/BUILD.gn @@ -14,6 +14,9 @@ component("blink") { "webgraphicscontext3d_in_process_command_buffer_impl.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "GPU_BLINK_IMPLEMENTATION" ] deps = [ @@ -33,9 +36,4 @@ component("blink") { "//ui/gfx", "//ui/gfx/geometry", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn index 2d28d1a..a5532cb 100644 --- a/gpu/command_buffer/client/BUILD.gn +++ b/gpu/command_buffer/client/BUILD.gn @@ -19,10 +19,8 @@ source_set("client") { defines = [ "GPU_IMPLEMENTATION" ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] # size_t to int truncation. - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] @@ -56,10 +54,8 @@ source_set("gles2_cmd_helper_sources") { defines = [ "GPU_IMPLEMENTATION" ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] # size_t to int truncation. - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":client", @@ -129,14 +125,12 @@ source_set("gpu_memory_buffer_manager") { component("gles2_implementation") { sources = gles2_implementation_source_files + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "GLES2_IMPL_IMPLEMENTATION" ] all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] # size_t to int truncation. - } - deps = [ ":gles2_cmd_helper", ":gles2_interface", @@ -171,10 +165,8 @@ component("gles2_c_lib") { sources = gles2_c_lib_source_files defines = [ "GLES2_C_LIB_IMPLEMENTATION" ] - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] # size_t to int truncation. - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":client", diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn index 1d86e69..4d068ed 100644 --- a/gpu/config/BUILD.gn +++ b/gpu/config/BUILD.gn @@ -45,6 +45,9 @@ source_set("config") { "software_rendering_list_json.cc", ] + # TODO(jschuh): size_t to int. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "GPU_IMPLEMENTATION" ] deps = [ @@ -69,9 +72,6 @@ source_set("config") { "//third_party/amd/amd_videocard_info_win.cc", ] } - - # TODO(jschuh): size_t to int. - cflags = [ "/wd4267" ] } if (use_libpci) { defines += [ "USE_LIBPCI=1" ] diff --git a/media/BUILD.gn b/media/BUILD.gn index 864eafe..1e7da3f 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -252,7 +252,12 @@ component("media") { "video/video_encode_accelerator.h", ] - configs += [ ":media_config" ] + configs += [ + ":media_config", + # TODO(wolenetz): Fix size_t to int trunctaion in win64. + # See http://crbug.com/171009 + "//build/config/compiler:no_size_t_to_int_warning", + ] all_dependent_configs = [ ":media_dependent_config" ] cflags = [] @@ -394,8 +399,6 @@ component("media") { "mfreadwrite.lib", "mfuuid.lib", ] - cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See - # http://crbug.com/171009 } if (proprietary_codecs) { @@ -579,6 +582,10 @@ test("media_unittests") { "video/h264_poc_unittest.cc", ] + # TODO(wolenetz): Fix size_t to int trunctaion in win64. + # See http://crbug.com/171009 + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":media", ":test_support", @@ -649,11 +656,6 @@ test("media_unittests") { ] } - if (is_win && cpu_arch == "x64") { - cflags = [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See - # http://crbug.com/171009 - } - if (is_mac || is_ios) { deps += [ "//media/base/mac" ] } diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn index 69369e2..9a85bd3 100644 --- a/media/cdm/ppapi/BUILD.gn +++ b/media/cdm/ppapi/BUILD.gn @@ -21,6 +21,9 @@ shared_library("clearkeycdm") { "external_clear_key/clear_key_cdm_common.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "CDM_IMPLEMENTATION" ] deps = [ @@ -41,11 +44,6 @@ shared_library("clearkeycdm") { deps += [ "//third_party/ffmpeg" ] } - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } - # TODO(GYP) on Mac: 'DYLIB_INSTALL_NAME_BASE': '@loader_path', } diff --git a/net/BUILD.gn b/net/BUILD.gn index 4935b67..6b9c93e 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,8 @@ component("net") { "DLOPEN_KERBEROS", "NET_IMPLEMENTATION", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_configs = [ ":net_config" ] include_dirs = [] @@ -568,8 +561,8 @@ static_library("http_server") { "server/web_socket_encoder.h", ] configs += [ + "//build/config/compiler:no_size_t_to_int_warning", "//build/config/compiler:wexit_time_destructors", - ":net_win_size_truncation", ] deps = [ ":net", @@ -593,7 +586,8 @@ executable("dump_cache") { "tools/dump_cache/url_utilities.h", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ "//base", @@ -691,7 +685,8 @@ source_set("test_support") { "url_request/url_request_test_util.h", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] public_deps = [ "//base", @@ -774,7 +769,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 +820,8 @@ if (!is_ios && !is_android) { sources = [ "tools/crash_cache/crash_cache.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":net", ":test_support", @@ -838,7 +834,8 @@ if (!is_ios && !is_android) { sources = [ "tools/crl_set_dump/crl_set_dump.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":net", "//base", @@ -850,7 +847,8 @@ if (!is_ios && !is_android) { sources = [ "tools/dns_fuzz_stub/dns_fuzz_stub.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":net", "//base", @@ -874,7 +872,8 @@ if (!is_ios && !is_android) { sources = [ "tools/get_server_time/get_server_time.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":net", "//base", @@ -925,7 +924,8 @@ if (!is_ios && !is_android) { sources = [ "disk_cache/blockfile/stress_cache.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":net", ":test_support", @@ -937,7 +937,8 @@ if (!is_ios && !is_android) { sources = [ "tools/tld_cleanup/tld_cleanup.cc", ] - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ "//base", "//base:i18n", @@ -1161,7 +1162,8 @@ if (!is_android && !is_win && !is_mac) { test("net_unittests") { sources = gypi_values.net_test_sources - configs += [ ":net_win_size_truncation" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] defines = [] deps = [ diff --git a/net/third_party/nss/ssl/BUILD.gn b/net/third_party/nss/ssl/BUILD.gn index 002bace..a40b71b 100644 --- a/net/third_party/nss/ssl/BUILD.gn +++ b/net/third_party/nss/ssl/BUILD.gn @@ -70,8 +70,6 @@ component("libssl") { configs += [ "//build/config/compiler:no_chromium_code" ] if (is_win) { - cflags += [ "/wd4267" ] # Disable warning: Conversion from size_t to 'type'. - sources -= [ "unix_err.c", "unix_err.h", diff --git a/pdf/BUILD.gn b/pdf/BUILD.gn index 49f49a4..0f74323 100644 --- a/pdf/BUILD.gn +++ b/pdf/BUILD.gn @@ -45,6 +45,9 @@ static_library("pdf") { "thumbnail_control.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + if (pdf_engine == 0) { sources += [ "pdfium/pdfium_api_string_buffer_adapter.cc", @@ -63,10 +66,6 @@ static_library("pdf") { ] } - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh) size_t to int truncations. - } - deps = [ "//base", "//components/ui/zoom:ui_zoom", diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn index f889137..9c44dad 100644 --- a/rlz/BUILD.gn +++ b/rlz/BUILD.gn @@ -55,6 +55,9 @@ source_set("rlz_lib") { "win/lib/rlz_value_store_registry.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + public_configs = [ ":rlz_config" ] deps = [ @@ -73,9 +76,6 @@ source_set("rlz_lib") { "mac/lib/rlz_value_store_mac.h", ] set_sources_assignment_filter(sources_assignment_filter) - } else if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } } @@ -106,6 +106,9 @@ test("rlz_unittests") { "win/lib/machine_deal_test.cc", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":rlz_lib", ":test_support", @@ -116,11 +119,6 @@ test("rlz_unittests") { "//testing/gtest", "//third_party/zlib", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } executable("rlz_id") { diff --git a/sql/BUILD.gn b/sql/BUILD.gn index 7c4d3f0..8b75d80 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -21,11 +21,10 @@ component("sql") { "transaction.h", ] - defines = [ "SQL_IMPLEMENTATION" ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - if (is_win) { - cflags = [ "/wd4267" ] # size_t to int. - } + defines = [ "SQL_IMPLEMENTATION" ] deps = [ "//base", @@ -68,9 +67,8 @@ test("sql_unittests") { "transaction_unittest.cc", ] - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ ":sql", diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn index 42e6a99..61e76c7a 100644 --- a/storage/browser/BUILD.gn +++ b/storage/browser/BUILD.gn @@ -170,10 +170,11 @@ component("browser") { ] defines = [ "STORAGE_BROWSER_IMPLEMENTATION" ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): fix size_t to int truncations. - } + configs += [ + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + "//build/config/compiler:wexit_time_destructors", + ] deps = [ "//base", diff --git a/storage/common/BUILD.gn b/storage/common/BUILD.gn index 0067972..2c55bb9 100644 --- a/storage/common/BUILD.gn +++ b/storage/common/BUILD.gn @@ -26,10 +26,10 @@ component("common") { "quota/quota_types.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "STORAGE_COMMON_IMPLEMENTATION" ] - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): fix size_t to int truncations. - } deps = [ "//base", diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index d245868..9c75f1b 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -52,7 +52,12 @@ component("boringssl") { } configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", + # TODO(davidben): Fix size_t truncations in BoringSSL. + # https://crbug.com/429039 + "//build/config/compiler:no_size_t_to_int_warning", + ] # Also gets the include dirs from :openssl_config include_dirs = [ @@ -64,12 +69,6 @@ component("boringssl") { "src/crypto", ] - if (is_win) { - # TODO(davidben): Fix size_t truncations in BoringSSL. - # https://crbug.com/429039 - cflags += [ "/wd4267" ] - } - if (cpu_arch == "x64") { if (is_mac) { sources += gypi_values.boringssl_mac_x86_64_sources diff --git a/third_party/cld/BUILD.gn b/third_party/cld/BUILD.gn index ed4075d..7a0c0eb 100644 --- a/third_party/cld/BUILD.gn +++ b/third_party/cld/BUILD.gn @@ -102,7 +102,6 @@ source_set("cld") { "/wd4005", # Macro defined twice. "/wd4006", # #undef expected an identifier. "/wd4309", # Truncation of constant value. - "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int ] } else { defines = [ "COMPILER_GCC" ] diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn index bede93a..8098eba 100644 --- a/third_party/cld_2/BUILD.gn +++ b/third_party/cld_2/BUILD.gn @@ -48,10 +48,6 @@ source_set("cld2_data") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int conversion. - } } # As in the corresponding gyp file, this just builds the core interfaces for @@ -66,10 +62,6 @@ source_set("cld_2") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int conversion. - } } source_set("cld2_platform_impl") { @@ -94,10 +86,6 @@ static_library("cld2_static") { ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int conversion. - } } config("cld2_dynamic_mode_config") { @@ -114,13 +102,9 @@ static_library("cld2_dynamic") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//build/config/compiler:no_chromium_code", ":cld2_dynamic_mode_config", + "//build/config/compiler:no_chromium_code", ] - - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int conversion. - } } # Does not build on Windows. @@ -144,12 +128,8 @@ if (!is_win) { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//build/config/compiler:no_chromium_code", ":cld2_dynamic_mode_config", + "//build/config/compiler:no_chromium_code", ] - - if (is_win) { - cflags = [ "/wd4267" ] # size_t -> int conversion. - } } } diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn index 000a9cc..6e93e04 100644 --- a/third_party/harfbuzz-ng/BUILD.gn +++ b/third_party/harfbuzz-ng/BUILD.gn @@ -162,7 +162,6 @@ if (use_system_harfbuzz) { } if (is_win) { cflags += [ - "/wd4267", # size_t to 'type' converion. "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits. ] } diff --git a/third_party/libexif/BUILD.gn b/third_party/libexif/BUILD.gn index b2b4fed..be8caf6 100644 --- a/third_party/libexif/BUILD.gn +++ b/third_party/libexif/BUILD.gn @@ -53,7 +53,6 @@ if (!is_linux || is_chromeos) { cflags = [ "/wd4018", # size/unsigned mismatch - "/wd4267", # size_t -> ExifLong truncation on amd64 ] # TODO(GYP): Handle /analyze switch, when it will be used in GN. diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 6357b92..fc13ff1 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -256,6 +256,10 @@ static_library("libjingle") { "$p2p_dir/base/constants.cc", "$p2p_dir/base/constants.h", ] + + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + public_deps = [ ":jingle_deps", ] @@ -266,10 +270,7 @@ static_library("libjingle") { # From libjingle_common.gypi's conditions list. if (is_win) { - cflags = [ - "/wd4005", - "/wd4267", - ] + cflags = [ "/wd4005" ] } configs += [ ":jingle_unexported_configs" ] diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn index 488ef43..787d4fa 100644 --- a/third_party/libpng/BUILD.gn +++ b/third_party/libpng/BUILD.gn @@ -52,12 +52,8 @@ source_set("libpng_sources") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): http://crbug.com/167187 - - if (component_mode == "shared_library") { - defines = [ "PNG_BUILD_DLL" ] - } + if (is_win && is_component_build) { + defines = [ "PNG_BUILD_DLL" ] } public_configs = [ ":libpng_config" ] diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn index 1367d8a..6825f1e 100644 --- a/third_party/protobuf/BUILD.gn +++ b/third_party/protobuf/BUILD.gn @@ -17,11 +17,6 @@ config("protobuf_config") { "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", ] - - if (is_win) { - # TODO(jschuh): http://crbug.com/167187 size_t -> int. - cflags = [ "/wd4267" ] - } } if (component_mode == "shared_library") { @@ -98,7 +93,11 @@ component("protobuf_lite") { if (is_win) { configs -= [ "//build/config/win:lean_and_mean" ] } - public_configs = [ ":protobuf_config" ] + public_configs = [ + ":protobuf_config", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + ] cflags = protobuf_lite_cflags @@ -177,7 +176,11 @@ source_set("protobuf_full") { if (is_win) { configs -= [ "//build/config/win:lean_and_mean" ] } - public_configs = [ ":protobuf_config" ] + public_configs = [ + ":protobuf_config", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + ] cflags = protobuf_lite_cflags } diff --git a/third_party/re2/BUILD.gn b/third_party/re2/BUILD.gn index d022e4f..2bc130a 100644 --- a/third_party/re2/BUILD.gn +++ b/third_party/re2/BUILD.gn @@ -67,10 +67,7 @@ static_library("re2") { if (is_win) { include_dirs = [ "mswin" ] - cflags = [ - "/wd4267", # Conversion from size_t. - "/wd4722", # Destructor never terminates. - ] + cflags = [ "/wd4722" ] # Destructor never terminates. } else { sources -= [ "mswin/stdint.h" ] } diff --git a/third_party/smhasher/BUILD.gn b/third_party/smhasher/BUILD.gn index e1bbb5e..fd9088c 100644 --- a/third_party/smhasher/BUILD.gn +++ b/third_party/smhasher/BUILD.gn @@ -27,9 +27,4 @@ source_set("cityhash") { ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - - if (is_win) { - # TODO(jschuh): http://code.google.com/p/smhasher/issues/detail?id=19 - cflags = [ "/wd4267" ] - } } diff --git a/third_party/snappy/BUILD.gn b/third_party/snappy/BUILD.gn index 0f440a5..4af0e81 100644 --- a/third_party/snappy/BUILD.gn +++ b/third_party/snappy/BUILD.gn @@ -36,9 +36,4 @@ static_library("snappy") { # https://code.google.com/p/snappy/issues/detail?id=70 configs -= [ "//build/config/clang:extra_warnings" ] } - - if (is_win) { - # https://code.google.com/p/snappy/issues/detail?id=75 - cflags = [ "/wd4267" ] # Conversion from size_t to 'type'. - } } diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn index 6f301ca..62efc0a 100644 --- a/third_party/sqlite/BUILD.gn +++ b/third_party/sqlite/BUILD.gn @@ -65,9 +65,7 @@ source_set("sqlite") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - if (is_win) { - cflags += [ "/wd4267" ] # Conversion from size_t to "type". - } else if (is_linux) { + if (is_linux) { cflags += [ # SQLite doesn"t believe in compiler warnings, # preferring testing. diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index cd9b453..3c5215e 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -148,8 +148,6 @@ if (current_toolchain == host_toolchain) { # re2c is missing CLOSEVOP from one switch. if (is_posix) { cflags = [ "-Wno-switch" ] - } else if (is_win) { - cflags = [ "/wd4267" ] # size_t to int conversion. } } @@ -248,9 +246,7 @@ if (current_toolchain == host_toolchain) { # directory, but the gen_x86_insn.py script does not make this easy. include_dirs = [ yasm_gen_include_dir ] - if (is_win) { - cflags = [ "/wd4267" ] # size_t to int conversion. - } else { + if (!is_win) { cflags = [ "-ansi", "-pedantic", diff --git a/tools/json_schema_compiler/test/BUILD.gn b/tools/json_schema_compiler/test/BUILD.gn index 76ae1b9..f91e699 100644 --- a/tools/json_schema_compiler/test/BUILD.gn +++ b/tools/json_schema_compiler/test/BUILD.gn @@ -36,12 +36,11 @@ source_set("test") { "test_util.cc", "test_util.h", ] + + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + public_deps = [ ":api", ] - - if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } } diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn index e032d67..9a330fb 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -176,6 +176,9 @@ source_set("test_support") { "test/window_test_api.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + public_deps = [ ":aura", ] @@ -194,8 +197,6 @@ source_set("test_support") { if (is_win) { sources += [ "test/ui_controls_factory_aurawin.cc" ] - - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } if (use_x11) { diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index c3eb671..a99a649 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -294,6 +294,9 @@ component("base") { sources += [ "touch/touch_device.cc" ] } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "UI_BASE_IMPLEMENTATION" ] public_deps = [ @@ -414,7 +417,6 @@ component("base") { ] deps += [ "//third_party/wtl" ] cflags = [ - "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int. "/wd4324", # Structure was padded due to __declspec(align()), which is # uninteresting. ] @@ -701,6 +703,9 @@ test("ui_base_unittests") { } } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ "//base", "//base/allocator", @@ -746,9 +751,6 @@ test("ui_base_unittests") { "imm32.lib", "oleacc.lib", ] - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } if (!is_win || !use_aura) { diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn index 53b002e..e697402 100644 --- a/ui/base/ime/BUILD.gn +++ b/ui/base/ime/BUILD.gn @@ -99,6 +99,9 @@ component("ime") { "win/tsf_input_scope.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "UI_BASE_IME_IMPLEMENTATION" ] deps = [ @@ -164,7 +167,6 @@ component("ime") { if (is_win) { cflags = [ - "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int. "/wd4324", # Structure was padded due to __declspec(align()), which is # uninteresting. ] diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index 003c5fd..5485a05 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -224,6 +224,9 @@ component("gfx") { "win/window_impl.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "GFX_IMPLEMENTATION" ] deps = [ @@ -307,7 +310,6 @@ component("gfx") { # Windows. if (is_win) { cflags = [ - "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int. "/wd4324", # Structure was padded due to __declspec(align()), which is # uninteresting. ] @@ -452,6 +454,9 @@ test("gfx_unittests") { ] } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":gfx", ":test_support", @@ -511,9 +516,6 @@ test("gfx_unittests") { "imm32.lib", "oleacc.lib", ] - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } } diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn index c6482de..b295019 100644 --- a/ui/message_center/BUILD.gn +++ b/ui/message_center/BUILD.gn @@ -23,6 +23,9 @@ component("message_center") { "//url", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "MESSAGE_CENTER_IMPLEMENTATION" ] if (enable_notifications && !is_android) { @@ -74,8 +77,6 @@ component("message_center") { ] if (is_win) { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] deps += [ "//ui/aura" ] } diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 726288c..be6c0da 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -14,6 +14,9 @@ gypi_values = exec_script("//build/gypi_to_gn.py", component("views") { sources = gypi_values.views_sources + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "VIEWS_IMPLEMENTATION" ] deps = [ @@ -67,7 +70,6 @@ component("views") { if (is_win) { sources += gypi_values.views_win_sources - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. libs = [ "imm32.lib", "oleacc.lib", diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn index c4289d8..455b06c 100644 --- a/ui/views/examples/BUILD.gn +++ b/ui/views/examples/BUILD.gn @@ -61,6 +61,9 @@ component("views_examples_lib") { "widget_example.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "VIEWS_EXAMPLES_IMPLEMENTATION" ] deps = [ @@ -78,9 +81,6 @@ component("views_examples_lib") { if (is_win) { deps += [ "//third_party/wtl" ] - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } if (use_aura) { diff --git a/url/BUILD.gn b/url/BUILD.gn index 03e90cb..964a08b 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -58,11 +58,11 @@ component("url") { defines = [ "URL_IMPLEMENTATION" ] - configs += [ ":url_icu_config" ] - - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - } + configs += [ + ":url_icu_config", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + ] deps = [ "//base", @@ -101,19 +101,15 @@ if (!is_android) { "url_util_unittest.cc", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + #if (is_posix && !is_mac && !is_ios) { # if (use_allocator!="none") { # deps += "//base/allocator" # } #} - if (is_win) { - cflags = [ - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - "/wd4267", - ] - } - deps = [ ":url", "//base", diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn index 43e0a64..35b30bd 100644 --- a/webkit/common/gpu/BUILD.gn +++ b/webkit/common/gpu/BUILD.gn @@ -15,11 +15,11 @@ component("gpu") { ] defines = [ "WEBKIT_GPU_IMPLEMENTATION" ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] - if (is_win) { + configs += [ + "//build/config/compiler:wexit_time_destructors", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + "//build/config/compiler:no_size_t_to_int_warning", + ] deps = [ "//base", diff --git a/win8/BUILD.gn b/win8/BUILD.gn index 84d7972..fe2a830 100644 --- a/win8/BUILD.gn +++ b/win8/BUILD.gn @@ -29,6 +29,10 @@ source_set("test_support_win8") { "//base", ":test_registrar_constants", ] + + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + sources = [ "test/metro_registration_helper.cc", "test/metro_registration_helper.h", @@ -39,9 +43,6 @@ source_set("test_support_win8") { "test/ui_automation_client.cc", "test/ui_automation_client.h", ] - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } source_set("test_registrar_constants") { |