Source release 15.0.0
This commit is contained in:
41
third_party/protobuf.gypi
vendored
41
third_party/protobuf.gypi
vendored
@@ -20,18 +20,16 @@
|
||||
'<(protobuf_source)/src/google/protobuf/extension_set.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/generated_message_table_driven_lite.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/generated_message_util.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/implicit_weak_message.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/io/coded_stream.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/io/zero_copy_stream.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/message_lite.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/repeated_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/bytestream.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/common.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/int128.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/io_win32.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/once.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/status.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/statusor.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/stubs/stringpiece.cc',
|
||||
@@ -52,6 +50,7 @@
|
||||
'-Woverloaded-virtual',
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-function',
|
||||
'-Wno-writable-strings',
|
||||
|
||||
# These flags silence warnings that appear in protobuf upstream.
|
||||
# We will not maintain a divergent copy of protobuf to fix them.
|
||||
@@ -65,6 +64,7 @@
|
||||
# that we need to filter the positive versions as well.
|
||||
'-Wsign-compare',
|
||||
'-Wunused-function',
|
||||
'-Wwritable-strings',
|
||||
'-Wshadow',
|
||||
'-Winvalid-offsetof',
|
||||
'-Wcast-qual',
|
||||
@@ -78,10 +78,18 @@
|
||||
# These defines come from Protobuf's BUILD file.
|
||||
'HAVE_PTHREAD',
|
||||
],
|
||||
'cflags=': ['<@(included_cflags)'],
|
||||
'cflags': ['<@(included_cflags)'],
|
||||
'cflags!': ['<@(excluded_cflags)'],
|
||||
'cflags_cc=': ['<@(included_cflags)'],
|
||||
'cflags_cc': ['<@(included_cflags)'],
|
||||
'cflags_cc!': ['<@(excluded_cflags)'],
|
||||
'msvs_settings': {
|
||||
'VCCLCompilerTool': {
|
||||
'DisableSpecificWarnings': [
|
||||
'4005', # Duplicate #define with WIN32_LEAN_AND_MEAN.
|
||||
'4506', # Missing definition of inline template.
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
@@ -106,9 +114,9 @@
|
||||
'defines': [
|
||||
'GOOGLE_PROTOBUF_NO_RTTI',
|
||||
],
|
||||
'cflags=': ['-Wno-unknown-warning-option', '-Wno-shadow'],
|
||||
'cflags': ['-Wno-unknown-warning-option', '-Wno-shadow'],
|
||||
'cflags!': ['-Wshadow'],
|
||||
'cflags_cc=': ['-Wno-unknown-warning-option', '-Wno-shadow'],
|
||||
'cflags_cc': ['-Wno-unknown-warning-option', '-Wno-shadow'],
|
||||
'cflags_cc!': ['-Wshadow'],
|
||||
},
|
||||
},
|
||||
@@ -249,17 +257,6 @@
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/java/java_shared_code_generator.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/java/java_string_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/java/java_string_field_lite.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_enum.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_enum_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_extension.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_file.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_generator.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_helpers.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_map_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_message.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_message_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/js/js_generator.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/js/well_known_types_embed.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/objectivec/objectivec_enum.cc',
|
||||
@@ -291,6 +288,14 @@
|
||||
'dependencies': [
|
||||
'protobuf',
|
||||
],
|
||||
'conditions': [
|
||||
['OS!="win"', {
|
||||
'libraries': [
|
||||
'-lpthread',
|
||||
'-lm',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user