CrOS: Convert MediaTransferProtocolDaemonClient to use protobufs.

build/protoc.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to invoke protoc in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_proto_lib',
@@ skipping 21 matching lines @@
 # like:
 #   #include "dir/for/my_proto_lib/foo.pb.h"
 #
 # Implementation notes:
 # A proto_out_dir of foo/bar produces
 #   <(SHARED_INTERMEDIATE_DIR)/protoc_out/foo/bar/{file1,file2}.pb.{cc,h}
 #   <(SHARED_INTERMEDIATE_DIR)/pyproto/foo/bar/{file1,file2}_pb2.py
 
 {
   '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)',
+    # Declspec to add to the generated protobuf c++ headers.

[Ryan Sleevi, 2012/09/12 22:21:25]

nit: declspec is Windows only, but presumably the dllexport_decl can be used
with Mac/Linux (eg: __attribute__((visibility, "default")) or whatever)

cc_generator_options seems to match what protoc calls it

[Lei Zhang, 2012/09/12 23:33:59]

Done.

+    # e.g. 'dllexport_decl=BASE_EXPORT:'
+    'cc_declspec%': '',
+    # File to #include for the declspec in the generated protobuf c++ headers.
+    # e.g. 'base/base_export.h'

[Ryan Sleevi, 2012/09/12 22:21:25]

nit: For consistency with the proto_in_dir/proto_out_dir documentation, seems
like this should be at line 28

[Lei Zhang, 2012/09/12 23:33:59]

Done.

+    'cc_declspec_include%': '',
     'proto_in_dir%': '.',
   },
   'rules': [
     {
       'rule_name': 'genproto',
       'extension': 'proto',
       'inputs': [
+        '<(protoc_wrapper)',
         '<(protoc)',
       ],
       'outputs': [
         '<(py_dir)/<(RULE_INPUT_ROOT)_pb2.py',
         '<(cc_dir)/<(RULE_INPUT_ROOT).pb.cc',
         '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
       ],
       'action': [
+        'python',
+        '<(protoc_wrapper)',
+        '--include',
+        '<(cc_declspec_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)',
         # 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)',
-        '--cpp_out','<(cc_dir)',
-        '--python_out','<(py_dir)',
-        ],
+        '--cpp_out', '<(cc_declspec)<(cc_dir)',
+        '--python_out', '<(py_dir)',
+      ],
       'msvs_cygwin_shell': 0,
       'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,
     },
   ],
   'dependencies': [
     '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
     '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
   ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
+    '<(DEPTH)',

[Ryan Sleevi, 2012/09/12 22:21:25]

BUG? Seems like this should also be propagated in direct_dependent_settings
(line 101), since anyone who includes the .pb.h will also need to include
whatever cc_declspec_include requires

[Lei Zhang, 2012/09/12 23:33:59]

Done.

   ],
   'direct_dependent_settings': {
     'include_dirs': [
       '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     ]
   },
   'export_dependent_settings': [
     # The generated headers reference headers within protobuf_lite,
     # so dependencies must be able to find those headers too.
     '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
   ],
   # This target exports a hard dependency because it generates header
   # files.
   'hard_dependency': 1,
 }