Source release 19.2.0

third_party/protoc.gypi

@@ -1,7 +1,7 @@
 # Copyright 2015 Google Inc. All rights reserved.
 {
   'variables': {
-    'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
+    'proto_gen_dir%': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'proto_in_dir%': '.',
     'protoc_gyp_path': './protobuf.gyp',
   },
@@ -36,10 +36,18 @@
       'export_dependent_settings': [
         '<(protoc_gyp_path):protobuf_lite',
       ],
-      'variables': {
+      'conditions': [
         # Since we are building protoc, we must supply the value of protoc_bin.
-        'protoc_bin': '<(PRODUCT_DIR)/protoc',
-      },
+        ['OS=="ios"', {
+          'variables': {
+            'protoc_bin': '$(BUILD_DIR)/$(CONFIGURATION)/protoc',
+          },
+        }, {
+          'variables': {
+            'protoc_bin': '<(PRODUCT_DIR)/protoc',
+          },
+        }],
+      ],
     }],
   ],
   'rules': [
@@ -47,8 +55,8 @@
       'rule_name': 'genproto',
       'extension': 'proto',
       'outputs': [
-        '<(cc_dir)/<(RULE_INPUT_ROOT).pb.cc',
-        '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
+        '<(proto_gen_dir)/<(RULE_INPUT_ROOT).pb.cc',
+        '<(proto_gen_dir)/<(RULE_INPUT_ROOT).pb.h',
       ],
       'msvs_cygwin_shell': '0',  # Don't run action in a CYGWIN shell.
       'action': [
@@ -57,18 +65,18 @@
         # Naively you'd use <(RULE_INPUT_PATH) here, but protoc requires
         # --proto_path is a strict prefix of the path given as an argument.
         '<(proto_in_dir)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
-        '--cpp_out=<(cc_dir)',
+        '--cpp_out=<(proto_gen_dir)',
       ],
-      'message': 'Generating C++ code from <(RULE_INPUT_PATH) ccdir=<(cc_dir)',
+      'message': 'Generating C++ code from <(RULE_INPUT_PATH) ccdir=<(proto_gen_dir)',
       'process_outputs_as_sources': 1,
     },
   ],
   'include_dirs': [
-    '<(cc_dir)',
+    '<(proto_gen_dir)',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
-      '<(cc_dir)',
+      '<(proto_gen_dir)',
     ]
   },
   # This target exports a hard dependency because it generates header