build/protoc.gypi - Issue 11231046: Linux: add an option to build with system protobuf.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/protoc.gypi

Issue 11231046: Linux: add an option to build with system protobuf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 8 years, 2 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:

Index: build/protoc.gypi

diff --git a/build/protoc.gypi b/build/protoc.gypi

index 897e446e8e86266844183a00ba625733378f8df7..e956718e0d038207bf660cd19948512d1df5c82a 100644

--- a/build/protoc.gypi

+++ b/build/protoc.gypi

@@ -48,12 +48,18 @@

{

'variables': {

'protoc_wrapper': '<(DEPTH)/tools/protoc_wrapper/protoc_wrapper.py',

- 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',

'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',

'py_dir': '<(PRODUCT_DIR)/pyproto/<(proto_out_dir)',

'cc_generator_options%': '',

'cc_include%': '',

'proto_in_dir%': '.',

+ 'conditions': [

+ ['use_system_protobuf==0', {

+ 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',

+ }, { # use_system_protobuf==1

+ 'protoc': '<!(which protoc)',

+ }],

+ ],

'rules': [

{

« no previous file with comments | « build/common.gypi ('k') | third_party/protobuf/protobuf.gyp » ('j') | no next file with comments »