Remove hand-rolled cases of protobufs generations/compilation

chrome/app/policy/cloud_policy_codegen.gyp

Index: chrome/app/policy/cloud_policy_codegen.gyp
diff --git a/chrome/app/policy/cloud_policy_codegen.gyp b/chrome/app/policy/cloud_policy_codegen.gyp
index 31d163e9285b324087c37ab70b0cad91bcc7a373..87317f296044ea61ea351128e8a99fb834158fc0 100644
--- a/chrome/app/policy/cloud_policy_codegen.gyp
+++ b/chrome/app/policy/cloud_policy_codegen.gyp
@@ -64,77 +64,35 @@
     {
       'target_name': 'cloud_policy_proto_compile',
       'type': 'none',
-      'actions': [
-        {
-          'action_name': 'compile_generated_proto',
-          'inputs': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-            '<(policy_out_dir)/policy/cloud_policy.proto',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/pyproto/device_management_pb/cloud_policy_pb2.py',
-            '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.h',
-            '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.cc',
-          ],
-          'action': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-            '--proto_path=<(policy_out_dir)/policy',
-            '<(policy_out_dir)/policy/cloud_policy.proto',
-            '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)',
-            '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb',
-          ],
-          'message': 'Compiling generated cloud policy protobuf',
-        },
+      'sources': [
+        '<(policy_out_dir)/policy/cloud_policy.proto',
       ],
+      'variables': {
+        'proto_in_dir': '<(policy_out_dir)/policy',
+        'proto_out_dir': 'chrome/browser/policy/proto',

[Ryan Sleevi, 2012/01/22 01:04:03]

You should be using <(policy_path_substr) here (because of lines 112-115)

+      },
       'dependencies': [
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
         'cloud_policy_code_generate',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(protoc_out_dir)',
-        ]
-      },
+      'includes': [ '../../../build/protoc.gypi' ],

[Ryan Sleevi, 2012/01/22 01:04:03]

You may want to double check the GYP syntax rules, but it's possible that
because this 'includes' introduces a dependencies that they may be replacing the
ones from 74-76, causing out of order building.

Using GYPD or related should help you show the dependencies, as I suggested on
the bug.

     },
     {
       'target_name': 'cloud_policy_backend_header_compile',
       'type': 'none',
       'sources': [
-        '<(proto_rel_path)/chrome_device_policy.proto',
-        '<(proto_rel_path)/device_management_backend.proto',
-        '<(proto_rel_path)/device_management_local.proto',
-        '<(proto_rel_path)/old_generic_format.proto',
-      ],
-      'rules': [
-        {
-          'rule_name': 'gen_proto',
-          'extension': 'proto',
-          'inputs': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/pyproto/device_management_pb/<(RULE_INPUT_ROOT)_pb2.py',
-            '<(protoc_out_dir)/<(proto_path_substr)/<(RULE_INPUT_ROOT).pb.h',
-            '<(protoc_out_dir)/<(proto_path_substr)/<(RULE_INPUT_ROOT).pb.cc',
-          ],
-          'action': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-            '--proto_path=<(proto_rel_path)',
-            '<(proto_rel_path)/<(RULE_INPUT_NAME)',
-            '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)',
-            '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb',
-          ],
-          'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
-        },
+        '../../browser/policy/proto/chrome_device_policy.proto',

[Ryan Sleevi, 2012/01/22 01:04:03]

Why did you stop using <(proto_rel_path) here?

+        '../../browser/policy/proto/device_management_backend.proto',
+        '../../browser/policy/proto/device_management_local.proto',
+        '../../browser/policy/proto/old_generic_format.proto',
       ],
+      'variables': {
+        'proto_in_dir': '../../browser/policy/proto',
+        'proto_out_dir': 'chrome/browser/policy/proto',
+      },
       'dependencies': [
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
+        'cloud_policy_code_generate',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(protoc_out_dir)',
-        ]
-      },
+      'includes': [ '../../../build/protoc.gypi' ],
     },
     {
       'target_name': 'policy',