Source release 17.1.0

third_party/protoc.gypi

@@ -3,8 +3,9 @@
   'variables': {
     'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'proto_in_dir%': '.',
-    'protoc_gyp%': '',
+    'protoc_gyp_path': './protobuf.gyp',
   },
+  'includes': ['disable_warnings.gypi'],
   'conditions': [
     ['protobuf_config=="system"', {
       # protobuf_lib is a library setting.
@@ -27,17 +28,17 @@
     }],
     ['protobuf_config=="source"', {
       # protobuf_lib is a source folder.
-      # We use the targets in protobuf.gypi.
+      # We use the targets in protobuf.gyp.
       'dependencies': [
-        '<(protoc_gyp):protoc#host',
-        '<(protoc_gyp):protobuf_lite',
+        '<(protoc_gyp_path):protoc#host',
+        '<(protoc_gyp_path):protobuf_lite',
       ],
       'export_dependent_settings': [
-        '<(protoc_gyp):protobuf_lite',
+        '<(protoc_gyp_path):protobuf_lite',
       ],
       'variables': {
-        # Since we are building our own protoc, override protoc_bin.
-        'protoc_bin%': '<(PRODUCT_DIR)/protoc',
+        # Since we are building protoc, we must supply the value of protoc_bin.
+        'protoc_bin': '<(PRODUCT_DIR)/protoc',
       },
     }],
   ],