diff options
| author | brettw <brettw@chromium.org> | 2015-02-19 15:17:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 23:18:14 +0000 |
| commit | d1c719acf7db459016f425eb8018ec4208511578 (patch) | |
| tree | f5604ba0055245c0133cd5747e8a70de99b917f7 /third_party/protobuf/BUILD.gn | |
| parent | 9ff250e0023b2f87e0fddd7eadbef7be3ecc3882 (diff) | |
| download | chromium_src-d1c719acf7db459016f425eb8018ec4208511578.zip chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.gz chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.bz2 | |
Update existing uses of /wd4267 to use the GN config
This is the size_t to integer conversion warning. Using the config prevents flag duplication and is clearer to read.
Minor updates to Win64 build, including some fixes for size_t to int conversions.
Review URL: https://codereview.chromium.org/929793006
Cr-Commit-Position: refs/heads/master@{#317162}
Diffstat (limited to 'third_party/protobuf/BUILD.gn')
| -rw-r--r-- | third_party/protobuf/BUILD.gn | 17 |
1 files changed, 10 insertions, 7 deletions
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 } |