| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['use_system_protobuf==0', { | 7 ['use_system_protobuf==0', { |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['OS!="win"', { | 9 ['OS!="win"', { |
| 10 'variables': { | 10 'variables': { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 # location that is shared with other projects. These actions are | 46 # location that is shared with other projects. These actions are |
| 47 # separated into two targets in order to be able to specify that t
he | 47 # separated into two targets in order to be able to specify that t
he |
| 48 # second action should not run until the first action finishes (si
nce | 48 # second action should not run until the first action finishes (si
nce |
| 49 # the ordering of multiple actions in one target is defined only b
y | 49 # the ordering of multiple actions in one target is defined only b
y |
| 50 # inputs and outputs, and it's impossible to set correct inputs fo
r | 50 # inputs and outputs, and it's impossible to set correct inputs fo
r |
| 51 # the ninja build, so setting all the inputs and outputs isn't an | 51 # the ninja build, so setting all the inputs and outputs isn't an |
| 52 # option). The first target is given here; the second target is th
e | 52 # option). The first target is given here; the second target is th
e |
| 53 # normal protoc target under the condition that "OS==iOS". | 53 # normal protoc target under the condition that "OS==iOS". |
| 54 'target_name': 'compile_protoc', | 54 'target_name': 'compile_protoc', |
| 55 'type': 'none', | 55 'type': 'none', |
| 56 'toolsets': ['host'], |
| 56 'includes': ['../../build/ios/mac_build.gypi'], | 57 'includes': ['../../build/ios/mac_build.gypi'], |
| 57 'actions': [ | 58 'actions': [ |
| 58 { | 59 { |
| 59 'action_name': 'compile protoc', | 60 'action_name': 'compile protoc', |
| 60 'inputs': [], | 61 'inputs': [], |
| 61 'outputs': [], | 62 'outputs': [], |
| 62 'action': [ | 63 'action': [ |
| 63 '<@(ninja_cmd)', | 64 '<@(ninja_cmd)', |
| 64 'protoc', | 65 'protoc', |
| 65 ], | 66 ], |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 ], | 233 ], |
| 233 'dependencies': [ | 234 'dependencies': [ |
| 234 'protobuf_full_do_not_use', | 235 'protobuf_full_do_not_use', |
| 235 ], | 236 ], |
| 236 'include_dirs': [ | 237 'include_dirs': [ |
| 237 '<(config_h_dir)', | 238 '<(config_h_dir)', |
| 238 'src/src', | 239 'src/src', |
| 239 ], | 240 ], |
| 240 }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja" | 241 }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja" |
| 241 'type': 'none', | 242 'type': 'none', |
| 243 'toolsets': ['host'], |
| 242 'dependencies': [ | 244 'dependencies': [ |
| 243 'compile_protoc', | 245 'compile_protoc', |
| 244 ], | 246 ], |
| 245 'actions': [ | 247 'actions': [ |
| 246 { | 248 { |
| 247 'action_name': 'copy protoc', | 249 'action_name': 'copy protoc', |
| 248 'inputs': [ | 250 'inputs': [ |
| 249 '<(ninja_product_dir)/protoc', | 251 '<(ninja_product_dir)/protoc', |
| 250 ], | 252 ], |
| 251 'outputs': [ | 253 'outputs': [ |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 'toolsets': ['host', 'target'], | 389 'toolsets': ['host', 'target'], |
| 388 }, | 390 }, |
| 389 { | 391 { |
| 390 'target_name': 'py_proto', | 392 'target_name': 'py_proto', |
| 391 'type': 'none', | 393 'type': 'none', |
| 392 }, | 394 }, |
| 393 ], | 395 ], |
| 394 }], | 396 }], |
| 395 ], | 397 ], |
| 396 } | 398 } |
| OLD | NEW |