Source release 16.4.0

third_party/protobuf.gypi

@@ -18,6 +18,7 @@
       '<(protobuf_source)/src/google/protobuf/any_lite.cc',
       '<(protobuf_source)/src/google/protobuf/arena.cc',
       '<(protobuf_source)/src/google/protobuf/extension_set.cc',
+      '<(protobuf_source)/src/google/protobuf/generated_enum_util.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',
@@ -25,6 +26,7 @@
       '<(protobuf_source)/src/google/protobuf/io/io_win32.cc',
       '<(protobuf_source)/src/google/protobuf/io/strtod.cc',
       '<(protobuf_source)/src/google/protobuf/io/zero_copy_stream.cc',
+      '<(protobuf_source)/src/google/protobuf/io/zero_copy_stream_impl.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/parse_context.cc',
@@ -42,37 +44,16 @@
       '<(protobuf_source)/src/google/protobuf/wire_format_lite.cc',
     ],
 
-    'included_cflags': [
-      # Ignore unknown warning options, to support both gcc & clang at once.
+    'dependent_included_warning_flags': [
       '-Wno-unknown-warning-option',
-
-      # These flags come from Protobuf's BUILD file.
-      '-Wno-write-strings',
-      '-Woverloaded-virtual',
-      '-Wno-sign-compare',
-      '-Wno-unused-function',
-
-      # These flags silence warnings that appear in protobuf upstream.
-      # We will not maintain a divergent copy of protobuf to fix them.
       '-Wno-shadow',
-      '-Wno-invalid-offsetof',
-      '-Wno-cast-qual',
-      '-Wno-ignored-qualifiers',
-      '-Wno-inconsistent-missing-override',
-      '-Wno-redundant-move',
+      '-Wno-useless-cast',
     ],
-    'excluded_cflags': [
-      # In addition to turning these off above, GYP's order-of-operations means
-      # that we need to filter the positive versions as well.
-      '-Wwrite-strings',
-      '-Wsign-compare',
-      '-Wunused-function',
+    'dependent_excluded_warning_flags': [
       '-Wshadow',
-      '-Winvalid-offsetof',
-      '-Wcast-qual',
-      '-Wignored-qualifiers',
-      '-Winconsistent-missing-override',
-      '-Wredundant-move',
+      '-Werror=shadow',
+      '-Wuseless-cast',
+      '-Werror=useless-cast',
     ],
   },
   'target_defaults': {
@@ -96,10 +77,7 @@
         '<(protobuf_source)',
         '<(protobuf_source)/src',
       ],
-      'cflags': ['<@(included_cflags)'],
-      'cflags!': ['<@(excluded_cflags)'],
-      'cflags_cc': ['<@(included_cflags)'],
-      'cflags_cc!': ['<@(excluded_cflags)'],
+      'includes': ['disable_warnings.gypi'],
       'xcode_settings': {
         'OTHER_CFLAGS': ['-w'],
         'USE_HEADERMAP': 'NO',
@@ -120,10 +98,10 @@
         'defines': [
           'GOOGLE_PROTOBUF_NO_RTTI',
         ],
-        'cflags': ['-Wno-unknown-warning-option', '-Wno-shadow'],
-        'cflags!': ['-Wshadow'],
-        'cflags_cc': ['-Wno-unknown-warning-option', '-Wno-shadow'],
-        'cflags_cc!': ['-Wshadow'],
+        'cflags': ['<@(dependent_included_warning_flags)'],
+        'cflags!': ['<@(dependent_excluded_warning_flags)'],
+        'cflags_c!': ['<@(dependent_excluded_warning_flags)'],
+        'cflags_cc!': ['<@(dependent_excluded_warning_flags)'],
       },
     },
     {
@@ -152,14 +130,12 @@
         '<(protobuf_source)/src/google/protobuf/io/gzip_stream.cc',
         '<(protobuf_source)/src/google/protobuf/io/printer.cc',
         '<(protobuf_source)/src/google/protobuf/io/tokenizer.cc',
-        '<(protobuf_source)/src/google/protobuf/io/zero_copy_stream_impl.cc',
         '<(protobuf_source)/src/google/protobuf/map_field.cc',
         '<(protobuf_source)/src/google/protobuf/message.cc',
         '<(protobuf_source)/src/google/protobuf/reflection_ops.cc',
         '<(protobuf_source)/src/google/protobuf/service.cc',
         '<(protobuf_source)/src/google/protobuf/source_context.pb.cc',
         '<(protobuf_source)/src/google/protobuf/struct.pb.cc',
-        '<(protobuf_source)/src/google/protobuf/stubs/mathlimits.cc',
         '<(protobuf_source)/src/google/protobuf/stubs/substitute.cc',
         '<(protobuf_source)/src/google/protobuf/text_format.cc',
         '<(protobuf_source)/src/google/protobuf/timestamp.pb.cc',
@@ -193,10 +169,7 @@
         '<(protobuf_source)',
         '<(protobuf_source)/src',
       ],
-      'cflags': ['<@(included_cflags)'],
-      'cflags!': ['<@(excluded_cflags)'],
-      'cflags_cc': ['<@(included_cflags)'],
-      'cflags_cc!': ['<@(excluded_cflags)'],
+      'includes': ['disable_warnings.gypi'],
       'xcode_settings': {
         'OTHER_CFLAGS': ['-w'],
         'USE_HEADERMAP': 'NO',
@@ -305,10 +278,7 @@
       'dependencies': [
         'protobuf',
       ],
-      'cflags': ['<@(included_cflags)'],
-      'cflags!': ['<@(excluded_cflags)'],
-      'cflags_cc': ['<@(included_cflags)'],
-      'cflags_cc!': ['<@(excluded_cflags)'],
+      'includes': ['disable_warnings.gypi'],
       'xcode_settings': {
         'OTHER_CFLAGS': ['-w'],
         'USE_HEADERMAP': 'NO',