Source release 15.2.0

third_party/protobuf.gypi

@@ -5,7 +5,7 @@
 # point here and protobuf_config is set to 'source'.
 #
 # Based on the BUILD file in the Protobuf C++ release package.
-# Source lists accurate as of Protobuf v3.5.1
+# Source lists accurate as of Protobuf v3.8.0
 
 {
   # Some sources are used by both protobuf_lite and protobuf. Representing this
@@ -15,21 +15,23 @@
   # variable in the sources of both libraries instead.
   'variables': {
     'protobuf_common_sources': [
+      '<(protobuf_source)/src/google/protobuf/any_lite.cc',
       '<(protobuf_source)/src/google/protobuf/arena.cc',
-      '<(protobuf_source)/src/google/protobuf/arenastring.cc',
       '<(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/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_lite.cc',
       '<(protobuf_source)/src/google/protobuf/message_lite.cc',
+      '<(protobuf_source)/src/google/protobuf/parse_context.cc',
       '<(protobuf_source)/src/google/protobuf/repeated_field.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/status.cc',
       '<(protobuf_source)/src/google/protobuf/stubs/statusor.cc',
       '<(protobuf_source)/src/google/protobuf/stubs/stringpiece.cc',
@@ -45,12 +47,10 @@
       '-Wno-unknown-warning-option',
 
       # These flags come from Protobuf's BUILD file.
-      '-Wall',
-      '-Wwrite-strings',
+      '-Wno-write-strings',
       '-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.
@@ -63,9 +63,9 @@
     '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',
-      '-Wwritable-strings',
       '-Wshadow',
       '-Winvalid-offsetof',
       '-Wcast-qual',
@@ -84,6 +84,9 @@
     'cflags!': ['<@(excluded_cflags)'],
     'cflags_cc': ['<@(included_cflags)'],
     'cflags_cc!': ['<@(excluded_cflags)'],
+    'xcode_settings': {
+      'USE_HEADERMAP': 'NO',
+    },
     'msvs_settings': {
       'VCCLCompilerTool': {
         # Disable warnings for third-party code.
@@ -145,7 +148,6 @@
         '<(protobuf_source)/src/google/protobuf/generated_message_table_driven.cc',
         '<(protobuf_source)/src/google/protobuf/io/gzip_stream.cc',
         '<(protobuf_source)/src/google/protobuf/io/printer.cc',
-        '<(protobuf_source)/src/google/protobuf/io/strtod.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',
@@ -240,8 +242,6 @@
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_generator.cc',
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_generator_factory.cc',
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_helpers.cc',
-        '<(protobuf_source)/src/google/protobuf/compiler/java/java_lazy_message_field.cc',
-        '<(protobuf_source)/src/google/protobuf/compiler/java/java_lazy_message_field_lite.cc',
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_map_field.cc',
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_map_field_lite.cc',
         '<(protobuf_source)/src/google/protobuf/compiler/java/java_message.cc',
@@ -295,6 +295,23 @@
             '-lm',
           ],
         }],
+        ['OS=="ios"', {
+          # Copy protoc to iPhone and Sim directories.  This allows finding it
+          # when using <(PRODUCT_DIR).
+          'copies': [{
+            'destination': '$(BUILD_DIR)/Default-iphoneos',
+            'xcode_code_sign': 1,
+            'files': [
+              '$(CONFIGURATION_BUILD_DIR)/protoc',
+            ],
+          }, {
+            'destination': '$(BUILD_DIR)/Default-iphonesimulator',
+            'xcode_code_sign': 1,
+            'files': [
+              '$(CONFIGURATION_BUILD_DIR)/protoc',
+            ],
+          }],
+        }],
       ],
     },
   ],