Index: third_party/protobuf/BUILD.gn |
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn |
index 8211662957579b073146ca338822f42b2946dc75..8709b402e0ac1f7f0d3e0e8f17aa75ea40f5dbd8 100644 |
--- a/third_party/protobuf/BUILD.gn |
+++ b/third_party/protobuf/BUILD.gn |
@@ -70,6 +70,7 @@ protobuf_lite_sources = [ |
"src/google/protobuf/stubs/atomicops_internals_mips_gcc.h", |
"src/google/protobuf/stubs/atomicops_internals_pnacl.h", |
"src/google/protobuf/stubs/atomicops_internals_power.h", |
+ "src/google/protobuf/stubs/atomicops_internals_ppc_gcc.h", |
"src/google/protobuf/stubs/atomicops_internals_solaris.h", |
"src/google/protobuf/stubs/atomicops_internals_tsan.h", |
"src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc", |
@@ -131,6 +132,7 @@ if (is_win) { |
"/wd4305", # double to float truncation |
"/wd4355", # 'this' used in base member initializer list |
"/wd4506", # no definition for inline function (protobuf issue #240) |
+ "/wd4715", # not all control paths return a value (fixed in trunk) |
] |
} |
@@ -387,6 +389,7 @@ if (current_toolchain == host_toolchain) { |
"src/google/protobuf/compiler/csharp/csharp_message.h", |
"src/google/protobuf/compiler/csharp/csharp_message_field.cc", |
"src/google/protobuf/compiler/csharp/csharp_message_field.h", |
+ "src/google/protobuf/compiler/csharp/csharp_options.h", |
"src/google/protobuf/compiler/csharp/csharp_primitive_field.cc", |
"src/google/protobuf/compiler/csharp/csharp_primitive_field.h", |
"src/google/protobuf/compiler/csharp/csharp_reflection_class.cc", |
@@ -415,6 +418,8 @@ if (current_toolchain == host_toolchain) { |
"src/google/protobuf/compiler/java/java_enum_lite.h", |
"src/google/protobuf/compiler/java/java_extension.cc", |
"src/google/protobuf/compiler/java/java_extension.h", |
+ "src/google/protobuf/compiler/java/java_extension_lite.cc", |
+ "src/google/protobuf/compiler/java/java_extension_lite.h", |
"src/google/protobuf/compiler/java/java_field.cc", |
"src/google/protobuf/compiler/java/java_field.h", |
"src/google/protobuf/compiler/java/java_file.cc", |