Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: remoting/proto/chromotocol.gyp

Issue 7621073: Unify gyp rules for running protoc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/protoc.gypi ('k') | remoting/proto/trace.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/proto/chromotocol.gyp
diff --git a/remoting/proto/chromotocol.gyp b/remoting/proto/chromotocol.gyp
index 0b45a7d57cdf097d3a14b0d55ff8c4ccb01d45b8..a1beb06df63c2443ef5dfc50df36b1b870f495d9 100644
--- a/remoting/proto/chromotocol.gyp
+++ b/remoting/proto/chromotocol.gyp
@@ -5,13 +5,11 @@
{
'variables': {
'chromium_code': 1,
- 'out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/remoting/proto',
},
'targets': [
{
- # Protobuf compiler / generate rule for chromoting.proto.
- 'target_name': 'chromotocol_proto',
- 'type': 'none',
+ 'target_name': 'chromotocol_proto_lib',
+ 'type': 'static_library',
'sources': [
'auth.proto',
'control.proto',
@@ -19,65 +17,10 @@
'internal.proto',
'video.proto',
],
- 'rules': [
- {
- 'rule_name': 'genproto',
- 'extension': 'proto',
- 'inputs': [
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
- ],
- 'outputs': [
- '<(out_dir)/<(RULE_INPUT_ROOT).pb.cc',
- '<(out_dir)/<(RULE_INPUT_ROOT).pb.h',
- ],
- 'action': [
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
- '--proto_path=.',
- './<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
- '--cpp_out=<(out_dir)',
- ],
- 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
- },
- ],
- 'dependencies': [
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
- ],
+ 'variables': {
+ 'proto_out_dir': 'remoting/proto',
},
- # This target exports a hard dependency because it generates header
- # files.
- 'hard_dependency': 1,
- },
-
- {
- 'target_name': 'chromotocol_proto_lib',
- 'type': 'static_library',
- 'export_dependent_settings': [
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
- 'chromotocol_proto',
- ],
- 'dependencies': [
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
- 'chromotocol_proto',
- ],
- # This target exports a hard dependency because depedents require
- # chromotocol_proto to compile.
- 'hard_dependency': 1,
- 'sources': [
- '<(out_dir)/auth.pb.cc',
- '<(out_dir)/auth.pb.h',
- '<(out_dir)/control.pb.cc',
- '<(out_dir)/control.pb.h',
- '<(out_dir)/event.pb.cc',
- '<(out_dir)/event.pb.h',
- '<(out_dir)/internal.pb.cc',
- '<(out_dir)/internal.pb.h',
- '<(out_dir)/video.pb.cc',
- '<(out_dir)/video.pb.h',
- ],
+ 'includes': ['../../build/protoc.gypi'],
},
],
}
« no previous file with comments | « build/protoc.gypi ('k') | remoting/proto/trace.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698