Index: remoting/proto/trace.gyp |
diff --git a/remoting/proto/trace.gyp b/remoting/proto/trace.gyp |
index a77947b3732cd8086efc8339bc048fc64de5b1e3..084c810e2a19dee33765fad2020463eed4118952 100644 |
--- a/remoting/proto/trace.gyp |
+++ b/remoting/proto/trace.gyp |
@@ -5,70 +5,18 @@ |
{ |
'variables': { |
'chromium_code': 1, |
- 'out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/remoting/proto', |
}, |
'targets': [ |
{ |
- # Protobuf compiler / generate rule for trace.proto. |
- 'target_name': 'trace_proto', |
- 'type': 'none', |
- 'sources': [ |
- 'trace.proto', |
- ], |
- 'rules': [ |
- { |
- 'rule_name': 'genproto', |
- 'extension': 'proto', |
- 'inputs': [ |
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', |
- ], |
- 'outputs': [ |
- '<(PRODUCT_DIR)/pyproto/<(RULE_INPUT_ROOT)_pb/' |
- '<(RULE_INPUT_ROOT)_pb2.py', |
- '<(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)', |
- '--python_out=<(PRODUCT_DIR)/pyproto/<(RULE_INPUT_ROOT)_pb', |
- ], |
- 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', |
- }, |
- ], |
- 'dependencies': [ |
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', |
- ], |
- # This target exports a hard dependency because it generates header |
- # files. |
- 'hard_dependency': 1, |
- }, |
- |
- { |
'target_name': 'trace_proto_lib', |
'type': 'static_library', |
- 'export_dependent_settings': [ |
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite', |
- 'trace_proto', |
- ], |
- 'dependencies': [ |
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite', |
- 'trace_proto', |
- ], |
- # This target exports a hard dependency because depedents require |
- # chromotocol_proto to compile. |
- 'hard_dependency': 1, |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '<(SHARED_INTERMEDIATE_DIR)/protoc_out', |
- ], |
- }, |
'sources': [ |
- '<(out_dir)/trace.pb.cc', |
- '<(out_dir)/trace.pb.h', |
+ 'trace.proto', |
], |
+ 'variables': { |
+ 'proto_out_dir': 'remoting/proto', |
+ }, |
+ 'includes': ['../../build/protoc.gypi'], |
}, |
], |
} |