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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/protobuf.gyp

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update sync unittest and README.chromium Created 4 years, 8 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
« third_party/protobuf/cleanup_release.sh ('K') | « third_party/protobuf/patches/0010-uninline-generated-code.patch ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | third_party/protobuf/protobuf_lite.gypi » ('J')
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 7417eecc8915165e77acbd30a01826fe14708122..dc5f72960587cb60b251cad02b432877cbfb446d 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -7,15 +7,16 @@
['use_system_protobuf==0', {
'conditions': [
['OS!="win"', {
- 'variables': {
- 'config_h_dir':
- '.', # crafted for gcc/linux.
- },
- }, { # else, OS=="win"
- 'variables': {
- 'config_h_dir':
- 'vsprojects', # crafted for msvc.
- },
+ 'target_defaults': {
+ 'defines': [
+ # protobuf requires these to be set manually, as it no longer
+ # uses config.h
+ 'HAVE_ZLIB',
+ 'HAVE_PTHREAD',
+ ],
+ }
+ }],
+ ['OS=="win"', {
'target_defaults': {
'msvs_disabled_warnings': [
4018, # signed/unsigned mismatch in comparison
@@ -23,6 +24,10 @@
4355, # 'this' used in base member initializer list
4267, # size_t to int truncation
4291, # no matching operator delete for a placement new
+ 4305, # double to float truncation
+ 4065, # switch statement contains 'default' but no 'case' labels
+ 4506, # no definition for inline function (protobuf issue #240)
+ 4146, # unary minus operator applied to unsigned type
],
'defines!': [
'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself.
@@ -87,6 +92,12 @@
'includes': [
'protobuf_lite.gypi',
],
+ 'variables': {
+ 'clang_warning_flags': [
+ # protobuf-3 contains a few functions that are unused.
+ '-Wno-unused-function',
+ ],
+ },
# Required for component builds. See http://crbug.com/172800.
'defines': [
'LIBPROTOBUF_EXPORTS',
@@ -110,61 +121,117 @@
'includes': [
'protobuf_lite.gypi',
],
+ 'variables': {
+ 'clang_warning_flags': [
+ # protobuf-3 contains a few functions that are unused.
+ '-Wno-unused-function',
+ ],
+ },
'sources': [
- 'src/google/protobuf/descriptor.h',
- 'src/google/protobuf/descriptor.pb.h',
- 'src/google/protobuf/descriptor_database.h',
- 'src/google/protobuf/dynamic_message.h',
- 'src/google/protobuf/generated_enum_reflection.h',
- 'src/google/protobuf/generated_message_reflection.h',
- 'src/google/protobuf/message.h',
- 'src/google/protobuf/reflection_ops.h',
- 'src/google/protobuf/service.h',
- 'src/google/protobuf/text_format.h',
- 'src/google/protobuf/wire_format.h',
- 'src/google/protobuf/io/gzip_stream.h',
- 'src/google/protobuf/io/printer.h',
- 'src/google/protobuf/io/tokenizer.h',
- 'src/google/protobuf/io/zero_copy_stream_impl.h',
- 'src/google/protobuf/compiler/code_generator.h',
- 'src/google/protobuf/compiler/command_line_interface.h',
- 'src/google/protobuf/compiler/importer.h',
- 'src/google/protobuf/compiler/java/java_doc_comment.cc',
- 'src/google/protobuf/compiler/java/java_doc_comment.h',
- 'src/google/protobuf/compiler/parser.h',
-
- 'src/google/protobuf/stubs/strutil.cc',
- 'src/google/protobuf/stubs/strutil.h',
- 'src/google/protobuf/stubs/substitute.cc',
- 'src/google/protobuf/stubs/substitute.h',
- 'src/google/protobuf/stubs/stl_util.h',
- 'src/google/protobuf/stubs/stringprintf.cc',
- 'src/google/protobuf/stubs/stringprintf.h',
- 'src/google/protobuf/stubs/structurally_valid.cc',
- 'src/google/protobuf/stubs/template_util.h',
- 'src/google/protobuf/stubs/type_traits.h',
-
- 'src/google/protobuf/descriptor.cc',
- 'src/google/protobuf/descriptor.pb.cc',
- 'src/google/protobuf/descriptor_database.cc',
- 'src/google/protobuf/dynamic_message.cc',
- 'src/google/protobuf/extension_set.cc',
- 'src/google/protobuf/extension_set.h',
- 'src/google/protobuf/extension_set_heavy.cc',
- 'src/google/protobuf/generated_message_reflection.cc',
- 'src/google/protobuf/message.cc',
- 'src/google/protobuf/reflection_ops.cc',
- 'src/google/protobuf/service.cc',
- 'src/google/protobuf/text_format.cc',
- 'src/google/protobuf/wire_format.cc',
- # This file pulls in zlib, but it's not actually used by protoc, so
- # instead of compiling zlib for the host, let's just exclude this.
- # 'src/src/google/protobuf/io/gzip_stream.cc',
- 'src/google/protobuf/io/printer.cc',
- 'src/google/protobuf/io/tokenizer.cc',
- 'src/google/protobuf/io/zero_copy_stream_impl.cc',
- 'src/google/protobuf/compiler/importer.cc',
- 'src/google/protobuf/compiler/parser.cc',
+ "src/google/protobuf/any.cc",
+ "src/google/protobuf/any.h",
+ "src/google/protobuf/any.pb.cc",
+ "src/google/protobuf/any.pb.h",
+ "src/google/protobuf/api.pb.cc",
+ "src/google/protobuf/api.pb.h",
+ "src/google/protobuf/compiler/importer.cc",
+ "src/google/protobuf/compiler/importer.h",
+ "src/google/protobuf/compiler/parser.cc",
+ "src/google/protobuf/compiler/parser.h",
+ "src/google/protobuf/descriptor.cc",
+ "src/google/protobuf/descriptor.h",
+ "src/google/protobuf/descriptor.pb.cc",
+ "src/google/protobuf/descriptor.pb.h",
+ "src/google/protobuf/descriptor_database.cc",
+ "src/google/protobuf/descriptor_database.h",
+ "src/google/protobuf/duration.pb.cc",
+ "src/google/protobuf/duration.pb.h",
+ "src/google/protobuf/dynamic_message.cc",
+ "src/google/protobuf/dynamic_message.h",
+ "src/google/protobuf/empty.pb.cc",
+ "src/google/protobuf/empty.pb.h",
+ "src/google/protobuf/extension_set_heavy.cc",
+ "src/google/protobuf/extension_set_heavy.h",
+ "src/google/protobuf/field_mask.pb.cc",
+ "src/google/protobuf/field_mask.pb.h",
+ "src/google/protobuf/generated_message_reflection.cc",
+ "src/google/protobuf/generated_message_reflection.h",
+ "src/google/protobuf/io/printer.cc",
+ "src/google/protobuf/io/printer.h",
+ "src/google/protobuf/io/strtod.cc",
+ "src/google/protobuf/io/strtod.h",
+ "src/google/protobuf/io/tokenizer.cc",
+ "src/google/protobuf/io/tokenizer.h",
+ "src/google/protobuf/io/zero_copy_stream_impl.cc",
+ "src/google/protobuf/io/zero_copy_stream_impl.h",
+ "src/google/protobuf/map_field.cc",
+ "src/google/protobuf/map_field.h",
+ "src/google/protobuf/message.cc",
+ "src/google/protobuf/message.h",
+ "src/google/protobuf/reflection_ops.cc",
+ "src/google/protobuf/reflection_ops.h",
+ "src/google/protobuf/service.cc",
+ "src/google/protobuf/service.h",
+ "src/google/protobuf/source_context.pb.cc",
+ "src/google/protobuf/source_context.pb.h",
+ "src/google/protobuf/struct.pb.cc",
+ "src/google/protobuf/struct.pb.h",
+ "src/google/protobuf/stubs/mathlimits.cc",
+ "src/google/protobuf/stubs/mathlimits.h",
+ "src/google/protobuf/stubs/substitute.cc",
+ "src/google/protobuf/stubs/substitute.h",
+ "src/google/protobuf/text_format.cc",
+ "src/google/protobuf/text_format.h",
+ "src/google/protobuf/timestamp.pb.cc",
+ "src/google/protobuf/timestamp.pb.h",
+ "src/google/protobuf/type.pb.cc",
+ "src/google/protobuf/type.pb.h",
+ "src/google/protobuf/unknown_field_set.cc",
+ "src/google/protobuf/unknown_field_set.h",
+ "src/google/protobuf/util/field_comparator.cc",
+ "src/google/protobuf/util/field_comparator.h",
+ "src/google/protobuf/util/field_mask_util.cc",
+ "src/google/protobuf/util/field_mask_util.h",
+ "src/google/protobuf/util/internal/datapiece.cc",
+ "src/google/protobuf/util/internal/datapiece.h",
+ "src/google/protobuf/util/internal/default_value_objectwriter.cc",
+ "src/google/protobuf/util/internal/default_value_objectwriter.h",
+ "src/google/protobuf/util/internal/error_listener.cc",
+ "src/google/protobuf/util/internal/error_listener.h",
+ "src/google/protobuf/util/internal/field_mask_utility.cc",
+ "src/google/protobuf/util/internal/field_mask_utility.h",
+ "src/google/protobuf/util/internal/json_escaping.cc",
+ "src/google/protobuf/util/internal/json_escaping.h",
+ "src/google/protobuf/util/internal/json_objectwriter.cc",
+ "src/google/protobuf/util/internal/json_objectwriter.h",
+ "src/google/protobuf/util/internal/json_stream_parser.cc",
+ "src/google/protobuf/util/internal/json_stream_parser.h",
+ "src/google/protobuf/util/internal/object_writer.cc",
+ "src/google/protobuf/util/internal/object_writer.h",
+ "src/google/protobuf/util/internal/proto_writer.cc",
+ "src/google/protobuf/util/internal/proto_writer.h",
+ "src/google/protobuf/util/internal/protostream_objectsource.cc",
+ "src/google/protobuf/util/internal/protostream_objectsource.h",
+ "src/google/protobuf/util/internal/protostream_objectwriter.cc",
+ "src/google/protobuf/util/internal/protostream_objectwriter.h",
+ "src/google/protobuf/util/internal/type_info.cc",
+ "src/google/protobuf/util/internal/type_info.h",
+ "src/google/protobuf/util/internal/type_info_test_helper.cc",
+ "src/google/protobuf/util/internal/type_info_test_helper.h",
+ "src/google/protobuf/util/internal/utility.cc",
+ "src/google/protobuf/util/internal/utility.h",
+ "src/google/protobuf/util/json_util.cc",
+ "src/google/protobuf/util/json_util.h",
+ "src/google/protobuf/util/message_differencer.cc",
+ "src/google/protobuf/util/message_differencer.h",
+ "src/google/protobuf/util/time_util.cc",
+ "src/google/protobuf/util/time_util.h",
+ "src/google/protobuf/util/type_resolver_util.cc",
+ "src/google/protobuf/util/type_resolver_util.h",
+ "src/google/protobuf/wire_format.cc",
+ "src/google/protobuf/wire_format.h",
+ "src/google/protobuf/wrappers.pb.cc",
+ "src/google/protobuf/wrappers.pb.h",
],
},
{
@@ -174,68 +241,58 @@
'type': 'executable',
'toolsets': ['host'],
'sources': [
- 'src/google/protobuf/compiler/code_generator.cc',
- 'src/google/protobuf/compiler/command_line_interface.cc',
- 'src/google/protobuf/compiler/plugin.cc',
- 'src/google/protobuf/compiler/plugin.pb.cc',
- 'src/google/protobuf/compiler/subprocess.cc',
- 'src/google/protobuf/compiler/subprocess.h',
- 'src/google/protobuf/compiler/zip_writer.cc',
- 'src/google/protobuf/compiler/zip_writer.h',
- 'src/google/protobuf/compiler/cpp/cpp_enum.cc',
- 'src/google/protobuf/compiler/cpp/cpp_enum.h',
- 'src/google/protobuf/compiler/cpp/cpp_enum_field.cc',
- 'src/google/protobuf/compiler/cpp/cpp_enum_field.h',
- 'src/google/protobuf/compiler/cpp/cpp_extension.cc',
- 'src/google/protobuf/compiler/cpp/cpp_extension.h',
- 'src/google/protobuf/compiler/cpp/cpp_field.cc',
- 'src/google/protobuf/compiler/cpp/cpp_field.h',
- 'src/google/protobuf/compiler/cpp/cpp_file.cc',
- 'src/google/protobuf/compiler/cpp/cpp_file.h',
- 'src/google/protobuf/compiler/cpp/cpp_generator.cc',
- 'src/google/protobuf/compiler/cpp/cpp_helpers.cc',
- 'src/google/protobuf/compiler/cpp/cpp_helpers.h',
- 'src/google/protobuf/compiler/cpp/cpp_message.cc',
- 'src/google/protobuf/compiler/cpp/cpp_message.h',
- 'src/google/protobuf/compiler/cpp/cpp_message_field.cc',
- 'src/google/protobuf/compiler/cpp/cpp_message_field.h',
- 'src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
- 'src/google/protobuf/compiler/cpp/cpp_primitive_field.h',
- 'src/google/protobuf/compiler/cpp/cpp_service.cc',
- 'src/google/protobuf/compiler/cpp/cpp_service.h',
- 'src/google/protobuf/compiler/cpp/cpp_string_field.cc',
- 'src/google/protobuf/compiler/cpp/cpp_string_field.h',
- 'src/google/protobuf/compiler/java/java_enum.cc',
- 'src/google/protobuf/compiler/java/java_enum.h',
- 'src/google/protobuf/compiler/java/java_enum_field.cc',
- 'src/google/protobuf/compiler/java/java_enum_field.h',
- 'src/google/protobuf/compiler/java/java_extension.cc',
- 'src/google/protobuf/compiler/java/java_extension.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',
- 'src/google/protobuf/compiler/java/java_file.h',
- 'src/google/protobuf/compiler/java/java_generator.cc',
- 'src/google/protobuf/compiler/java/java_helpers.cc',
- 'src/google/protobuf/compiler/java/java_helpers.h',
- 'src/google/protobuf/compiler/java/java_message.cc',
- 'src/google/protobuf/compiler/java/java_message.h',
- 'src/google/protobuf/compiler/java/java_message_field.cc',
- 'src/google/protobuf/compiler/java/java_message_field.h',
- 'src/google/protobuf/compiler/java/java_primitive_field.cc',
- 'src/google/protobuf/compiler/java/java_primitive_field.h',
- 'src/google/protobuf/compiler/java/java_service.cc',
- 'src/google/protobuf/compiler/java/java_service.h',
- 'src/google/protobuf/compiler/java/java_string_field.cc',
- 'src/google/protobuf/compiler/java/java_string_field.h',
- 'src/google/protobuf/compiler/python/python_generator.cc',
- 'src/google/protobuf/compiler/main.cc',
+ "src/google/protobuf/compiler/code_generator.cc",
+ "src/google/protobuf/compiler/code_generator.h",
+ "src/google/protobuf/compiler/command_line_interface.cc",
+ "src/google/protobuf/compiler/command_line_interface.h",
+ "src/google/protobuf/compiler/cpp/cpp_enum.cc",
+ "src/google/protobuf/compiler/cpp/cpp_enum.h",
+ "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_enum_field.h",
+ "src/google/protobuf/compiler/cpp/cpp_extension.cc",
+ "src/google/protobuf/compiler/cpp/cpp_extension.h",
+ "src/google/protobuf/compiler/cpp/cpp_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_field.h",
+ "src/google/protobuf/compiler/cpp/cpp_file.cc",
+ "src/google/protobuf/compiler/cpp/cpp_file.h",
+ "src/google/protobuf/compiler/cpp/cpp_generator.cc",
+ "src/google/protobuf/compiler/cpp/cpp_generator.h",
+ "src/google/protobuf/compiler/cpp/cpp_helpers.cc",
+ "src/google/protobuf/compiler/cpp/cpp_helpers.h",
+ "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_map_field.h",
+ "src/google/protobuf/compiler/cpp/cpp_message.cc",
+ "src/google/protobuf/compiler/cpp/cpp_message.h",
+ "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_message_field.h",
+ "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_primitive_field.h",
+ "src/google/protobuf/compiler/cpp/cpp_service.cc",
+ "src/google/protobuf/compiler/cpp/cpp_service.h",
+ "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
+ "src/google/protobuf/compiler/cpp/cpp_string_field.h",
+ "src/google/protobuf/compiler/main.cc",
+ "src/google/protobuf/compiler/plugin.cc",
+ "src/google/protobuf/compiler/plugin.h",
+ "src/google/protobuf/compiler/plugin.pb.cc",
+ "src/google/protobuf/compiler/plugin.pb.h",
+ "src/google/protobuf/compiler/python/python_generator.cc",
+ "src/google/protobuf/compiler/python/python_generator.h",
+ "src/google/protobuf/compiler/subprocess.cc",
+ "src/google/protobuf/compiler/subprocess.h",
+ "src/google/protobuf/compiler/zip_writer.cc",
+ "src/google/protobuf/compiler/zip_writer.h",
],
+ 'variables': {
+ 'clang_warning_flags': [
+ # protobuf-3 contains a few functions that are unused.
+ '-Wno-unused-function',
+ ],
+ },
'dependencies': [
'protobuf_full_do_not_use',
],
'include_dirs': [
- '<(config_h_dir)',
'src/src',
],
}, { # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"
@@ -276,18 +333,28 @@
],
},
{
+ 'destination': '<(PRODUCT_DIR)/pyproto/google/third_party/six/',
+ 'files': [
+ 'third_party/six/six.py',
+ ],
+ },
+ {
'destination': '<(PRODUCT_DIR)/pyproto/google/protobuf',
'files': [
- 'python/google/protobuf/__init__.py',
- 'python/google/protobuf/descriptor.py',
- 'python/google/protobuf/descriptor_database.py',
- 'python/google/protobuf/descriptor_pool.py',
- 'python/google/protobuf/message.py',
- 'python/google/protobuf/message_factory.py',
- 'python/google/protobuf/reflection.py',
- 'python/google/protobuf/service.py',
- 'python/google/protobuf/service_reflection.py',
- 'python/google/protobuf/text_format.py',
+ "python/google/protobuf/__init__.py",
+ "python/google/protobuf/descriptor.py",
+ "python/google/protobuf/descriptor_database.py",
+ "python/google/protobuf/descriptor_pool.py",
+ "python/google/protobuf/json_format.py",
+ "python/google/protobuf/message.py",
+ "python/google/protobuf/message_factory.py",
+ "python/google/protobuf/proto_builder.py",
+ "python/google/protobuf/reflection.py",
+ "python/google/protobuf/service.py",
+ "python/google/protobuf/service_reflection.py",
+ "python/google/protobuf/symbol_database.py",
+ "python/google/protobuf/text_encoding.py",
+ "python/google/protobuf/text_format.py",
# TODO(ncarter): protoc's python generator treats
# descriptor.proto specially, but it's not possible to trigger
@@ -303,18 +370,18 @@
{
'destination': '<(PRODUCT_DIR)/pyproto/google/protobuf/internal',
'files': [
- 'python/google/protobuf/internal/__init__.py',
- 'python/google/protobuf/internal/api_implementation.py',
- 'python/google/protobuf/internal/containers.py',
- 'python/google/protobuf/internal/cpp_message.py',
- 'python/google/protobuf/internal/decoder.py',
- 'python/google/protobuf/internal/encoder.py',
- 'python/google/protobuf/internal/enum_type_wrapper.py',
- 'python/google/protobuf/internal/generator_test.py',
- 'python/google/protobuf/internal/message_listener.py',
- 'python/google/protobuf/internal/python_message.py',
- 'python/google/protobuf/internal/type_checkers.py',
- 'python/google/protobuf/internal/wire_format.py',
+ "python/google/protobuf/internal/__init__.py",
+ "python/google/protobuf/internal/_parameterized.py",
+ "python/google/protobuf/internal/api_implementation.py",
+ "python/google/protobuf/internal/containers.py",
+ "python/google/protobuf/internal/decoder.py",
+ "python/google/protobuf/internal/encoder.py",
+ "python/google/protobuf/internal/enum_type_wrapper.py",
+ "python/google/protobuf/internal/message_listener.py",
+ "python/google/protobuf/internal/python_message.py",
+ "python/google/protobuf/internal/type_checkers.py",
+ "python/google/protobuf/internal/well_known_types.py",
+ "python/google/protobuf/internal/wire_format.py",
],
},
],
« third_party/protobuf/cleanup_release.sh ('K') | « third_party/protobuf/patches/0010-uninline-generated-code.patch ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | third_party/protobuf/protobuf_lite.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698