Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Side by Side Diff: third_party/protobuf/protobuf.gyp

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 10 matching lines...) Expand all
21 4018, # signed/unsigned mismatch in comparison 21 4018, # signed/unsigned mismatch in comparison
22 4244, # implicit conversion, possible loss of data 22 4244, # implicit conversion, possible loss of data
23 4355, # 'this' used in base member initializer list 23 4355, # 'this' used in base member initializer list
24 4267, # size_t to int truncation 24 4267, # size_t to int truncation
25 ], 25 ],
26 'defines!': [ 26 'defines!': [
27 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself. 27 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself.
28 ], 28 ],
29 }, 29 },
30 }], 30 }],
31 ['OS=="ios"', { 31 ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
32 'variables': { 32 'variables': {
33 'ninja_output_dir': 'ninja-protoc', 33 'ninja_output_dir': 'ninja-protoc',
34 'ninja_product_dir': 34 'ninja_product_dir':
35 '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)', 35 '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
36 # Gyp to rerun 36 # Gyp to rerun
37 're_run_targets': [ 37 're_run_targets': [
38 'third_party/protobuf/protobuf.gyp', 38 'third_party/protobuf/protobuf.gyp',
39 ], 39 ],
40 }, 40 },
41 'targets': [ 41 'targets': [
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 'src/google/protobuf/io/printer.cc', 198 'src/google/protobuf/io/printer.cc',
199 'src/google/protobuf/io/tokenizer.cc', 199 'src/google/protobuf/io/tokenizer.cc',
200 'src/google/protobuf/io/zero_copy_stream_impl.cc', 200 'src/google/protobuf/io/zero_copy_stream_impl.cc',
201 'src/google/protobuf/compiler/importer.cc', 201 'src/google/protobuf/compiler/importer.cc',
202 'src/google/protobuf/compiler/parser.cc', 202 'src/google/protobuf/compiler/parser.cc',
203 ], 203 ],
204 }, 204 },
205 { 205 {
206 'target_name': 'protoc', 206 'target_name': 'protoc',
207 'conditions': [ 207 'conditions': [
208 ['OS!="ios"', { 208 ['OS!="ios" or "<(GENERATOR)"=="ninja"', {
209 'type': 'executable', 209 'type': 'executable',
210 'toolsets': ['host'], 210 'toolsets': ['host'],
211 'sources': [ 211 'sources': [
212 'src/google/protobuf/compiler/code_generator.cc', 212 'src/google/protobuf/compiler/code_generator.cc',
213 'src/google/protobuf/compiler/command_line_interface.cc', 213 'src/google/protobuf/compiler/command_line_interface.cc',
214 'src/google/protobuf/compiler/plugin.cc', 214 'src/google/protobuf/compiler/plugin.cc',
215 'src/google/protobuf/compiler/plugin.pb.cc', 215 'src/google/protobuf/compiler/plugin.pb.cc',
216 'src/google/protobuf/compiler/subprocess.cc', 216 'src/google/protobuf/compiler/subprocess.cc',
217 'src/google/protobuf/compiler/subprocess.h', 217 'src/google/protobuf/compiler/subprocess.h',
218 'src/google/protobuf/compiler/zip_writer.cc', 218 'src/google/protobuf/compiler/zip_writer.cc',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 'src/google/protobuf/compiler/python/python_generator.cc', 266 'src/google/protobuf/compiler/python/python_generator.cc',
267 'src/google/protobuf/compiler/main.cc', 267 'src/google/protobuf/compiler/main.cc',
268 ], 268 ],
269 'dependencies': [ 269 'dependencies': [
270 'protobuf_full_do_not_use', 270 'protobuf_full_do_not_use',
271 ], 271 ],
272 'include_dirs': [ 272 'include_dirs': [
273 '<(config_h_dir)', 273 '<(config_h_dir)',
274 'src/src', 274 'src/src',
275 ], 275 ],
276 }, { # else, OS=="ios" 276 }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja"
277 'type': 'none', 277 'type': 'none',
278 'dependencies': [ 278 'dependencies': [
279 'compile_protoc', 279 'compile_protoc',
280 ], 280 ],
281 'actions': [ 281 'actions': [
282 { 282 {
283 'action_name': 'copy protoc', 283 'action_name': 'copy protoc',
284 'inputs': [ 284 'inputs': [
285 '<(ninja_product_dir)/protoc', 285 '<(ninja_product_dir)/protoc',
286 ], 286 ],
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 'toolsets': ['host', 'target'], 419 'toolsets': ['host', 'target'],
420 }, 420 },
421 { 421 {
422 'target_name': 'py_proto', 422 'target_name': 'py_proto',
423 'type': 'none', 423 'type': 'none',
424 }, 424 },
425 ], 425 ],
426 }], 426 }],
427 ], 427 ],
428 } 428 }
OLDNEW
« breakpad/breakpad.gyp ('K') | « third_party/mach_override/mach_override.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698