Update protobuf.gyp for iOS.

 protoc must be build for the Mac platform and not for iOS. mac_build.gypi is used to allow this.

TEST=None
BUG=None
R=stuartmorgan@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10855048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 106 insertions, 66 deletions

diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 7c55c24..6b060f2 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -165,72 +165,112 @@
     },
     {
       'target_name': 'protoc',
-      'type': 'executable',
-      'toolsets': ['host'],
-      'sources': [
-        'src/google/protobuf/compiler/code_generator.cc',
-        'src/google/protobuf/compiler/command_line_interface.cc',
-        'src/google/protobuf/compiler/plugin.cc',
-        'src/google/protobuf/compiler/plugin.pb.cc',
-        'src/google/protobuf/compiler/subprocess.cc',
-        'src/google/protobuf/compiler/subprocess.h',
-        'src/google/protobuf/compiler/zip_writer.cc',
-        'src/google/protobuf/compiler/zip_writer.h',
-        'src/google/protobuf/compiler/cpp/cpp_enum.cc',
-        'src/google/protobuf/compiler/cpp/cpp_enum.h',
-        'src/google/protobuf/compiler/cpp/cpp_enum_field.cc',
-        'src/google/protobuf/compiler/cpp/cpp_enum_field.h',
-        'src/google/protobuf/compiler/cpp/cpp_extension.cc',
-        'src/google/protobuf/compiler/cpp/cpp_extension.h',
-        'src/google/protobuf/compiler/cpp/cpp_field.cc',
-        'src/google/protobuf/compiler/cpp/cpp_field.h',
-        'src/google/protobuf/compiler/cpp/cpp_file.cc',
-        'src/google/protobuf/compiler/cpp/cpp_file.h',
-        'src/google/protobuf/compiler/cpp/cpp_generator.cc',
-        'src/google/protobuf/compiler/cpp/cpp_helpers.cc',
-        'src/google/protobuf/compiler/cpp/cpp_helpers.h',
-        'src/google/protobuf/compiler/cpp/cpp_message.cc',
-        'src/google/protobuf/compiler/cpp/cpp_message.h',
-        'src/google/protobuf/compiler/cpp/cpp_message_field.cc',
-        'src/google/protobuf/compiler/cpp/cpp_message_field.h',
-        'src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
-        'src/google/protobuf/compiler/cpp/cpp_primitive_field.h',
-        'src/google/protobuf/compiler/cpp/cpp_service.cc',
-        'src/google/protobuf/compiler/cpp/cpp_service.h',
-        'src/google/protobuf/compiler/cpp/cpp_string_field.cc',
-        'src/google/protobuf/compiler/cpp/cpp_string_field.h',
-        'src/google/protobuf/compiler/java/java_enum.cc',
-        'src/google/protobuf/compiler/java/java_enum.h',
-        'src/google/protobuf/compiler/java/java_enum_field.cc',
-        'src/google/protobuf/compiler/java/java_enum_field.h',
-        'src/google/protobuf/compiler/java/java_extension.cc',
-        'src/google/protobuf/compiler/java/java_extension.h',
-        'src/google/protobuf/compiler/java/java_field.cc',
-        'src/google/protobuf/compiler/java/java_field.h',
-        'src/google/protobuf/compiler/java/java_file.cc',
-        'src/google/protobuf/compiler/java/java_file.h',
-        'src/google/protobuf/compiler/java/java_generator.cc',
-        'src/google/protobuf/compiler/java/java_helpers.cc',
-        'src/google/protobuf/compiler/java/java_helpers.h',
-        'src/google/protobuf/compiler/java/java_message.cc',
-        'src/google/protobuf/compiler/java/java_message.h',
-        'src/google/protobuf/compiler/java/java_message_field.cc',
-        'src/google/protobuf/compiler/java/java_message_field.h',
-        'src/google/protobuf/compiler/java/java_primitive_field.cc',
-        'src/google/protobuf/compiler/java/java_primitive_field.h',
-        'src/google/protobuf/compiler/java/java_service.cc',
-        'src/google/protobuf/compiler/java/java_service.h',
-        'src/google/protobuf/compiler/java/java_string_field.cc',
-        'src/google/protobuf/compiler/java/java_string_field.h',
-        'src/google/protobuf/compiler/python/python_generator.cc',
-        'src/google/protobuf/compiler/main.cc',
-      ],
-      'dependencies': [
-        'protobuf_full_do_not_use',
-      ],
-      'include_dirs': [
-        '<(config_h_dir)',
-        'src/src',
+      'conditions': [
+        ['OS!="ios"', {
+          'type': 'executable',
+          'toolsets': ['host'],
+          'sources': [
+            'src/google/protobuf/compiler/code_generator.cc',
+            'src/google/protobuf/compiler/command_line_interface.cc',
+            'src/google/protobuf/compiler/plugin.cc',
+            'src/google/protobuf/compiler/plugin.pb.cc',
+            'src/google/protobuf/compiler/subprocess.cc',
+            'src/google/protobuf/compiler/subprocess.h',
+            'src/google/protobuf/compiler/zip_writer.cc',
+            'src/google/protobuf/compiler/zip_writer.h',
+            'src/google/protobuf/compiler/cpp/cpp_enum.cc',
+            'src/google/protobuf/compiler/cpp/cpp_enum.h',
+            'src/google/protobuf/compiler/cpp/cpp_enum_field.cc',
+            'src/google/protobuf/compiler/cpp/cpp_enum_field.h',
+            'src/google/protobuf/compiler/cpp/cpp_extension.cc',
+            'src/google/protobuf/compiler/cpp/cpp_extension.h',
+            'src/google/protobuf/compiler/cpp/cpp_field.cc',
+            'src/google/protobuf/compiler/cpp/cpp_field.h',
+            'src/google/protobuf/compiler/cpp/cpp_file.cc',
+            'src/google/protobuf/compiler/cpp/cpp_file.h',
+            'src/google/protobuf/compiler/cpp/cpp_generator.cc',
+            'src/google/protobuf/compiler/cpp/cpp_helpers.cc',
+            'src/google/protobuf/compiler/cpp/cpp_helpers.h',
+            'src/google/protobuf/compiler/cpp/cpp_message.cc',
+            'src/google/protobuf/compiler/cpp/cpp_message.h',
+            'src/google/protobuf/compiler/cpp/cpp_message_field.cc',
+            'src/google/protobuf/compiler/cpp/cpp_message_field.h',
+            'src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
+            'src/google/protobuf/compiler/cpp/cpp_primitive_field.h',
+            'src/google/protobuf/compiler/cpp/cpp_service.cc',
+            'src/google/protobuf/compiler/cpp/cpp_service.h',
+            'src/google/protobuf/compiler/cpp/cpp_string_field.cc',
+            'src/google/protobuf/compiler/cpp/cpp_string_field.h',
+            'src/google/protobuf/compiler/java/java_enum.cc',
+            'src/google/protobuf/compiler/java/java_enum.h',
+            'src/google/protobuf/compiler/java/java_enum_field.cc',
+            'src/google/protobuf/compiler/java/java_enum_field.h',
+            'src/google/protobuf/compiler/java/java_extension.cc',
+            'src/google/protobuf/compiler/java/java_extension.h',
+            'src/google/protobuf/compiler/java/java_field.cc',
+            'src/google/protobuf/compiler/java/java_field.h',
+            'src/google/protobuf/compiler/java/java_file.cc',
+            'src/google/protobuf/compiler/java/java_file.h',
+            'src/google/protobuf/compiler/java/java_generator.cc',
+            'src/google/protobuf/compiler/java/java_helpers.cc',
+            'src/google/protobuf/compiler/java/java_helpers.h',
+            'src/google/protobuf/compiler/java/java_message.cc',
+            'src/google/protobuf/compiler/java/java_message.h',
+            'src/google/protobuf/compiler/java/java_message_field.cc',
+            'src/google/protobuf/compiler/java/java_message_field.h',
+            'src/google/protobuf/compiler/java/java_primitive_field.cc',
+            'src/google/protobuf/compiler/java/java_primitive_field.h',
+            'src/google/protobuf/compiler/java/java_service.cc',
+            'src/google/protobuf/compiler/java/java_service.h',
+            'src/google/protobuf/compiler/java/java_string_field.cc',
+            'src/google/protobuf/compiler/java/java_string_field.h',
+            'src/google/protobuf/compiler/python/python_generator.cc',
+            'src/google/protobuf/compiler/main.cc',
+          ],
+          'dependencies': [
+            'protobuf_full_do_not_use',
+          ],
+          'include_dirs': [
+            '<(config_h_dir)',
+            'src/src',
+          ],
+        }, {  # else, OS=="ios"
+          'type': 'none',
+          'variables': {
+            'ninja_output_dir': 'ninja-protoc',
+            # Gyp to rerun
+            're_run_targets': [
+              'third_party/protobuf/protobuf.gyp',
+            ],
+          },
+          'includes': ['../../build/ios/mac_build.gypi'],
+          'actions': [
+            {
+              'action_name': 'compile protoc',
+              'inputs': [],
+              'outputs': [],
+              'action': [
+                '<@(ninja_cmd)',
+                'protoc',
+              ],
+              'message': 'Generating the C++ protocol buffers compiler',
+            },
+            {
+              'action_name': 'copy protoc',
+              'inputs': [
+                '<(ninja_product_dir)/protoc',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/protoc',
+              ],
+              'action': [
+                'cp',
+                '<(ninja_product_dir)/protoc',
+                '<(PRODUCT_DIR)/protoc',
+              ],
+            },
+          ],
+        }],
       ],
     },
     {