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

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

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 6 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
« no previous file with comments | « third_party/protobuf/protobuf.bzl ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'target_defaults': { 10 'target_defaults': {
11 'msvs_disabled_warnings': [ 11 'msvs_disabled_warnings': [
12 4018, # signed/unsigned mismatch in comparison 12 4018, # signed/unsigned mismatch in comparison
13 4065, # switch statement contains 'default' but no 'case' labels 13 4065, # switch statement contains 'default' but no 'case' labels
14 4146, # unary minus operator applied to unsigned type 14 4146, # unary minus operator applied to unsigned type
15 4244, # implicit conversion, possible loss of data 15 4244, # implicit conversion, possible loss of data
16 4267, # size_t to int truncation 16 4267, # size_t to int truncation
17 4291, # no matching operator delete for a placement new 17 4291, # no matching operator delete for a placement new
18 4305, # double to float truncation 18 4305, # double to float truncation
19 4355, # 'this' used in base member initializer list 19 4355, # 'this' used in base member initializer list
20 4506, # no definition for inline function (protobuf issue #240) 20 4506, # no definition for inline function (protobuf issue #240)
21 4715, # not all control paths return a value (fixed in trunk)
21 ], 22 ],
22 'defines!': [ 23 'defines!': [
23 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself. 24 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself.
24 ], 25 ],
25 }, 26 },
26 }], 27 }],
27 ['OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninj a"', { 28 ['OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninj a"', {
28 'variables': { 29 'variables': {
29 'ninja_output_dir': 'ninja-protoc', 30 'ninja_output_dir': 'ninja-protoc',
30 'ninja_product_dir': 31 'ninja_product_dir':
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 "src/google/protobuf/compiler/csharp/csharp_generator.cc", 293 "src/google/protobuf/compiler/csharp/csharp_generator.cc",
293 "src/google/protobuf/compiler/csharp/csharp_generator.h", 294 "src/google/protobuf/compiler/csharp/csharp_generator.h",
294 "src/google/protobuf/compiler/csharp/csharp_helpers.cc", 295 "src/google/protobuf/compiler/csharp/csharp_helpers.cc",
295 "src/google/protobuf/compiler/csharp/csharp_helpers.h", 296 "src/google/protobuf/compiler/csharp/csharp_helpers.h",
296 "src/google/protobuf/compiler/csharp/csharp_map_field.cc", 297 "src/google/protobuf/compiler/csharp/csharp_map_field.cc",
297 "src/google/protobuf/compiler/csharp/csharp_map_field.h", 298 "src/google/protobuf/compiler/csharp/csharp_map_field.h",
298 "src/google/protobuf/compiler/csharp/csharp_message.cc", 299 "src/google/protobuf/compiler/csharp/csharp_message.cc",
299 "src/google/protobuf/compiler/csharp/csharp_message.h", 300 "src/google/protobuf/compiler/csharp/csharp_message.h",
300 "src/google/protobuf/compiler/csharp/csharp_message_field.cc", 301 "src/google/protobuf/compiler/csharp/csharp_message_field.cc",
301 "src/google/protobuf/compiler/csharp/csharp_message_field.h", 302 "src/google/protobuf/compiler/csharp/csharp_message_field.h",
303 "src/google/protobuf/compiler/csharp/csharp_options.h",
302 "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc", 304 "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
303 "src/google/protobuf/compiler/csharp/csharp_primitive_field.h", 305 "src/google/protobuf/compiler/csharp/csharp_primitive_field.h",
304 "src/google/protobuf/compiler/csharp/csharp_reflection_class.cc", 306 "src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
305 "src/google/protobuf/compiler/csharp/csharp_reflection_class.h", 307 "src/google/protobuf/compiler/csharp/csharp_reflection_class.h",
306 "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc", 308 "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
307 "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h", 309 "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h",
308 "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.c c", 310 "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.c c",
309 "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h ", 311 "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h ",
310 "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field .cc", 312 "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field .cc",
311 "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field .h", 313 "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field .h",
312 "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc ", 314 "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc ",
313 "src/google/protobuf/compiler/csharp/csharp_source_generator_base.h" , 315 "src/google/protobuf/compiler/csharp/csharp_source_generator_base.h" ,
314 "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc", 316 "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
315 "src/google/protobuf/compiler/csharp/csharp_wrapper_field.h", 317 "src/google/protobuf/compiler/csharp/csharp_wrapper_field.h",
316 "src/google/protobuf/compiler/java/java_context.cc", 318 "src/google/protobuf/compiler/java/java_context.cc",
317 "src/google/protobuf/compiler/java/java_context.h", 319 "src/google/protobuf/compiler/java/java_context.h",
318 "src/google/protobuf/compiler/java/java_doc_comment.cc", 320 "src/google/protobuf/compiler/java/java_doc_comment.cc",
319 "src/google/protobuf/compiler/java/java_doc_comment.h", 321 "src/google/protobuf/compiler/java/java_doc_comment.h",
320 "src/google/protobuf/compiler/java/java_enum.cc", 322 "src/google/protobuf/compiler/java/java_enum.cc",
321 "src/google/protobuf/compiler/java/java_enum.h", 323 "src/google/protobuf/compiler/java/java_enum.h",
322 "src/google/protobuf/compiler/java/java_enum_field.cc", 324 "src/google/protobuf/compiler/java/java_enum_field.cc",
323 "src/google/protobuf/compiler/java/java_enum_field.h", 325 "src/google/protobuf/compiler/java/java_enum_field.h",
324 "src/google/protobuf/compiler/java/java_enum_field_lite.cc", 326 "src/google/protobuf/compiler/java/java_enum_field_lite.cc",
325 "src/google/protobuf/compiler/java/java_enum_field_lite.h", 327 "src/google/protobuf/compiler/java/java_enum_field_lite.h",
326 "src/google/protobuf/compiler/java/java_enum_lite.cc", 328 "src/google/protobuf/compiler/java/java_enum_lite.cc",
327 "src/google/protobuf/compiler/java/java_enum_lite.h", 329 "src/google/protobuf/compiler/java/java_enum_lite.h",
328 "src/google/protobuf/compiler/java/java_extension.cc", 330 "src/google/protobuf/compiler/java/java_extension.cc",
329 "src/google/protobuf/compiler/java/java_extension.h", 331 "src/google/protobuf/compiler/java/java_extension.h",
332 "src/google/protobuf/compiler/java/java_extension_lite.cc",
333 "src/google/protobuf/compiler/java/java_extension_lite.h",
330 "src/google/protobuf/compiler/java/java_field.cc", 334 "src/google/protobuf/compiler/java/java_field.cc",
331 "src/google/protobuf/compiler/java/java_field.h", 335 "src/google/protobuf/compiler/java/java_field.h",
332 "src/google/protobuf/compiler/java/java_file.cc", 336 "src/google/protobuf/compiler/java/java_file.cc",
333 "src/google/protobuf/compiler/java/java_file.h", 337 "src/google/protobuf/compiler/java/java_file.h",
334 "src/google/protobuf/compiler/java/java_generator.cc", 338 "src/google/protobuf/compiler/java/java_generator.cc",
335 "src/google/protobuf/compiler/java/java_generator.h", 339 "src/google/protobuf/compiler/java/java_generator.h",
336 "src/google/protobuf/compiler/java/java_generator_factory.cc", 340 "src/google/protobuf/compiler/java/java_generator_factory.cc",
337 "src/google/protobuf/compiler/java/java_generator_factory.h", 341 "src/google/protobuf/compiler/java/java_generator_factory.h",
338 "src/google/protobuf/compiler/java/java_helpers.cc", 342 "src/google/protobuf/compiler/java/java_helpers.cc",
339 "src/google/protobuf/compiler/java/java_helpers.h", 343 "src/google/protobuf/compiler/java/java_helpers.h",
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 'toolsets': ['host', 'target'], 621 'toolsets': ['host', 'target'],
618 }, 622 },
619 { 623 {
620 'target_name': 'py_proto', 624 'target_name': 'py_proto',
621 'type': 'none', 625 'type': 'none',
622 }, 626 },
623 ], 627 ],
624 }], 628 }],
625 ], 629 ],
626 } 630 }
OLDNEW
« no previous file with comments | « third_party/protobuf/protobuf.bzl ('k') | third_party/protobuf/protobuf_lite.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698