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: http://src.chromium.org/svn/trunk/src/build@171015 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d6e95af750
Коммит
c321407001
|
@ -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)',
|
||||
],
|
||||
|
|
Загрузка…
Ссылка в новой задаче