From 2f32567474b7ca15f86f44634ce2799ac2e3ade7 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Wed, 31 Oct 2012 23:29:37 +0000 Subject: 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 --- build/protoc.gypi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'build/protoc.gypi') 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': '