Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: third_party/protobuf/protobuf.gyp

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/protobuf.bzl ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/protobuf.gyp
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index e77e17949d7b28d3244386d0df550e6b8fd6111b..cb5ec3454273733d68aa8072736e351d263275e0 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -18,6 +18,7 @@
4305, # double to float truncation
4355, # 'this' used in base member initializer list
4506, # no definition for inline function (protobuf issue #240)
+ 4715, # not all control paths return a value (fixed in trunk)
],
'defines!': [
'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself.
@@ -299,6 +300,7 @@
"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",
@@ -327,6 +329,8 @@
"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",
« no previous file with comments | « third_party/protobuf/protobuf.bzl ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698