diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:08:17 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:08:17 +0000 |
| commit | 0837d0c2ed18e58cffa2d2cb57d6864201a11354 (patch) | |
| tree | 24fa0e975ad0fc257f60f2a3c50ca5c97381833e /build | |
| parent | a4dd60ac689f3cf63c426da79c8a788a68f13c44 (diff) | |
| download | chromium_src-0837d0c2ed18e58cffa2d2cb57d6864201a11354.zip chromium_src-0837d0c2ed18e58cffa2d2cb57d6864201a11354.tar.gz chromium_src-0837d0c2ed18e58cffa2d2cb57d6864201a11354.tar.bz2 | |
Linux: update protoc wrapper to allow building with system protobuf.
Now when using system protobuf the wrapper copies all relevant
.proto files to a temporary directory and removes parts not supported
by system protobuf.
No rewriting is done when using bundled protobuf (default).
BUG=157155
Review URL: https://codereview.chromium.org/11418310
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/protoc.gypi | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/protoc.gypi b/build/protoc.gypi index a20dce0..52fb8a2b6 100644 --- a/build/protoc.gypi +++ b/build/protoc.gypi @@ -82,14 +82,15 @@ '<(cc_include)', '--protobuf', '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h', - '--', - '<(protoc)', # Using the --arg val form (instead of --arg=val) allows gyp's msvs rule # generation to correct 'val' which is a path. - '--proto_path','<(proto_in_dir)', + '--proto-in-dir','<(proto_in_dir)', # Naively you'd use <(RULE_INPUT_PATH) here, but protoc requires # --proto_path is a strict prefix of the path given as an argument. - '<(proto_in_dir)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', + '--proto-in-file','<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', + '--use-system-protobuf=<(use_system_protobuf)', + '--', + '<(protoc)', '--cpp_out', '<(cc_generator_options)<(cc_dir)', '--python_out', '<(py_dir)', ], |