diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 23:29:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 23:29:37 +0000 |
| commit | 2f32567474b7ca15f86f44634ce2799ac2e3ade7 (patch) | |
| tree | 176a4dad3e3150dc3a0555026e1ce6a355f46b18 /build/protoc.gypi | |
| parent | e237176a06c256fb8839ff0f4368c12de91f6839 (diff) | |
| download | chromium_src-2f32567474b7ca15f86f44634ce2799ac2e3ade7.zip chromium_src-2f32567474b7ca15f86f44634ce2799ac2e3ade7.tar.gz chromium_src-2f32567474b7ca15f86f44634ce2799ac2e3ade7.tar.bz2 | |
Linux: add an option to build with system protobuf.
This doesn't work yet without upstream protobuf changes,
but with this infrastructure in place it's going to be
easier to test further updates.
Google Chrome will of course use the bundled version,
there's no change here.
BUG=157155
TEST=none
Review URL: https://codereview.chromium.org/11231046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/protoc.gypi')
| -rw-r--r-- | build/protoc.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/protoc.gypi b/build/protoc.gypi index 897e446..e956718 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': [ { |