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

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

Issue 11418102: Linux: fix header includes for system protobuf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/util.h ('k') | no next file » | 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 'variables': { 10 'variables': {
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 { 439 {
440 'target_name': 'protobuf_lite', 440 'target_name': 'protobuf_lite',
441 'type': 'none', 441 'type': 'none',
442 'direct_dependent_settings': { 442 'direct_dependent_settings': {
443 'cflags': [ 443 'cflags': [
444 # Use full protobuf, because vanilla protobuf doesn't have 444 # Use full protobuf, because vanilla protobuf doesn't have
445 # our custom patch to retain unknown fields in lite mode. 445 # our custom patch to retain unknown fields in lite mode.
446 '<!@(pkg-config --cflags protobuf)', 446 '<!@(pkg-config --cflags protobuf)',
447 ], 447 ],
448 'defines': [ 448 'defines': [
449 'USE_SYSTEM_PROTOBUF',
450
449 # This macro must be defined to suppress the use 451 # This macro must be defined to suppress the use
450 # of dynamic_cast<>, which requires RTTI. 452 # of dynamic_cast<>, which requires RTTI.
451 'GOOGLE_PROTOBUF_NO_RTTI', 453 'GOOGLE_PROTOBUF_NO_RTTI',
452 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', 454 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
453 ], 455 ],
454 }, 456 },
455 'link_settings': { 457 'link_settings': {
456 # Use full protobuf, because vanilla protobuf doesn't have 458 # Use full protobuf, because vanilla protobuf doesn't have
457 # our custom patch to retain unknown fields in lite mode. 459 # our custom patch to retain unknown fields in lite mode.
458 'ldflags': [ 460 'ldflags': [
(...skipping 10 matching lines...) Expand all
469 'toolsets': ['host', 'target'], 471 'toolsets': ['host', 'target'],
470 }, 472 },
471 { 473 {
472 'target_name': 'py_proto', 474 'target_name': 'py_proto',
473 'type': 'none', 475 'type': 'none',
474 }, 476 },
475 ], 477 ],
476 }], 478 }],
477 ], 479 ],
478 } 480 }
OLDNEW
« no previous file with comments | « remoting/protocol/util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698