| Index: third_party/protobuf/BUILD.gn
|
| diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
|
| index 1367d8a16b7fc8df45be4d1f0c09ad6886f8c713..6825f1e0af2281b5461027bbe6a9268209604f7b 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
|
| }
|
|
|