Remove hand-rolled cases of protobufs generations/compilation

chrome/app/policy/cloud_policy_codegen.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'generate_policy_source_script_path':
@@ skipping 45 matching lines @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(policy_out_dir)',
           '<(protoc_out_dir)',
         ],
       },
     },
     {
       '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',
-        },
+      'type': 'static_library',

[Ryan Sleevi, 2012/01/13 01:21:52]

We don't want this. It should still be a 'none' target (and that's fine).

This changes the semantics to actually produce a static lib, which should then
fail compiling due to ODR violations when 'policy' is built (also as a static
library)

[KushalP, 2012/01/13 12:47:50]

That makes sense. I got the impression that we wanted generated object files
because we'll only be including headers.

On 2012/01/13 01:21:52, Ryan Sleevi wrote:

+      'sources': [
+        'app/policy/cloud_policy.proto',
       ],
+      'variables': {
+        'proto_in_dir': 'app/policy',

[Ryan Sleevi, 2012/01/13 01:21:52]

Doesn't this need to be '<(policy_out_dir)/policy' to match the
semantics/behaviours of the hand-rolled implementation?

The same for line 68.

These are generated files (by 'cloud_policy_code_generate'), so they don't exist
naked in the tree AFAICT.

+        'proto_out_dir': 'chrome/app/policy',
+      },
       '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': 'cloud_policy_backend_header_compile',
-      'type': 'none',
+      'type': 'static_library',

[Ryan Sleevi, 2012/01/13 01:21:52]

Same here (re: none vs static_library)

       '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',
+        'browser/policy/proto/chrome_device_policy.proto',
+        'browser/policy/proto/device_management_backend.proto',
+        'browser/policy/proto/device_management_local.proto',
+        'browser/policy/proto/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)',
-        },
-      ],
-      'dependencies': [
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(protoc_out_dir)',
-        ]
+      'variables': {
+        'proto_in_dir': 'browser/policy/proto',
+        'proto_out_dir': 'chrome/browser/policy/proto',
       },
+      'includes': [ '../../../build/protoc.gypi' ],
     },
     {
       'target_name': 'policy',
       'type': 'static_library',
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
           '<(policy_out_dir)',
           '<(protoc_out_dir)',
         ],
@@ skipping 48 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }