Commit 110ffe56 authored by qsr@chromium.org's avatar qsr@chromium.org

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
parent 17dd2424
...@@ -165,6 +165,8 @@ ...@@ -165,6 +165,8 @@
}, },
{ {
'target_name': 'protoc', 'target_name': 'protoc',
'conditions': [
['OS!="ios"', {
'type': 'executable', 'type': 'executable',
'toolsets': ['host'], 'toolsets': ['host'],
'sources': [ 'sources': [
...@@ -232,6 +234,44 @@ ...@@ -232,6 +234,44 @@
'<(config_h_dir)', '<(config_h_dir)',
'src/src', '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',
],
},
],
}],
],
}, },
{ {
# Generate the python module needed by all protoc-generated Python code. # Generate the python module needed by all protoc-generated Python code.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment