Update sync protos to use the new shared protoc gyp rules

chrome/browser/sync/protocol/sync_proto.gyp

Index: chrome/browser/sync/protocol/sync_proto.gyp
diff --git a/chrome/browser/sync/protocol/sync_proto.gyp b/chrome/browser/sync/protocol/sync_proto.gyp
index dc550feaae65decd9105d5919e356efca3b4534d..ad603289429a77d5f46a9d3935e3341feaef25c9 100644
--- a/chrome/browser/sync/protocol/sync_proto.gyp
+++ b/chrome/browser/sync/protocol/sync_proto.gyp
@@ -5,14 +5,11 @@
 {
   'variables': {
     'chromium_code': 1,
-    'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
   },
   'targets': [
     {
-      # Protobuf compiler / generate rule for sync.proto.  This is used by
-      # test code in net, which is why it's isolated into its own .gyp file.
       'target_name': 'sync_proto',
-      'type': 'none',
+      'type': 'static_library',
       'sources': [
         'sync.proto',
         'encryption.proto',
@@ -29,79 +26,10 @@
         'theme_specifics.proto',
         'typed_url_specifics.proto',
       ],
-      'rules': [
-        {
-          'rule_name': 'genproto',
-          'extension': 'proto',
-          'inputs': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/pyproto/sync_pb/<(RULE_INPUT_ROOT)_pb2.py',
-            '<(protoc_out_dir)/chrome/browser/sync/protocol/<(RULE_INPUT_ROOT).pb.h',
-            '<(protoc_out_dir)/chrome/browser/sync/protocol/<(RULE_INPUT_ROOT).pb.cc',
-          ],
-          'action': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-            '--proto_path=.',
-            './<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
-            '--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
-            '--python_out=<(PRODUCT_DIR)/pyproto/sync_pb',
-          ],
-          'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
-        },
-      ],
-      'dependencies': [
-        '../../../../third_party/protobuf/protobuf.gyp:protoc#host',
-      ],
-    },
-    {
-      'target_name': 'sync_proto_cpp',
-      'type': 'static_library',
-      'sources': [
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/encryption.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/encryption.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/app_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/app_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/autofill_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/autofill_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/bookmark_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/bookmark_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/extension_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/extension_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/nigori_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/nigori_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/password_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/password_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/preference_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/preference_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/search_engine_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/search_engine_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/session_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/session_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/theme_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/theme_specifics.pb.h',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/typed_url_specifics.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/sync/protocol/typed_url_specifics.pb.h',
-      ],
-      'export_dependent_settings': [
-        '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        'sync_proto',
-      ],
-      'dependencies': [
-        '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        'sync_proto',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(protoc_out_dir)',
-        ],
+      'variables': {
+        'proto_out_dir': 'chrome/browser/sync/protocol',
       },
-      # This target exports a hard dependency because it includes generated
-      # header files.
-      'hard_dependency': 1,

[akalin, 2011/08/18 22:28:17]

pretty sure we still need a hard dep here

[Evan Martin, 2011/08/18 22:36:18]

The protoc include puts a hard_dependency in.  (Everything that uses protoc
needs a hard dep, so I refactored it to there.)

+      'includes': ['../../../../build/protoc.gypi'],
     },
   ],
 }