Commiting http://codereview.chromium.org/2017007/show on behalf of rkc@chromi...

chrome/chrome_browser.gypi

 # Copyright (c) 2010 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
       'dependencies': [
         'common',
         'common_net',
         'chrome_resources',
         'chrome_strings',
         'chrome_version_info',
         'component_extensions',
         'domui_shared_resources',
         'net_internals_resources',
         'platform_locale_settings',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'syncapi',
         'theme_resources',
+        'userfeedback_proto',
         '../app/app.gyp:app_resources',
         '../app/app.gyp:app_strings',
         '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjingle/libjingle.gyp:libjingle',
@@ skipping 257 matching lines @@
         'browser/browsing_data_database_helper.cc',
         'browser/browsing_data_database_helper.h',
         'browser/browsing_data_local_storage_helper.cc',
         'browser/browsing_data_local_storage_helper.h',
         'browser/browsing_data_remover.cc',
         'browser/browsing_data_remover.h',
         'browser/browsing_instance.cc',
         'browser/browsing_instance.h',
         'browser/bug_report_util.cc',
         'browser/bug_report_util.h',
+        # TODO(rkc): Find a better way to include these files
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/annotations.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/common.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/config.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/dom.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/extension.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/math.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/web.pb.cc',
         'browser/cancelable_request.cc',
         'browser/cancelable_request.h',
         'browser/cert_store.cc',
         'browser/cert_store.h',
         'browser/character_encoding.cc',
         'browser/character_encoding.h',
         'browser/child_process_host.cc',
         'browser/child_process_host.h',
         'browser/child_process_launcher.cc',
         'browser/child_process_launcher.h',
@@ skipping 2854 matching lines @@
               ],
             }],
             ['OS=="linux" and chromeos==1',{
               'sources/': [
                 ['exclude', '^browser/notifications/balloon_collection.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_linux.cc'],
               ],
               'dependencies': [
                 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+                #'../third_party/protobuf2/protobuf.gyp:protobuf',
                 '../third_party/protobuf2/protobuf.gyp:protoc#host',
                 '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:session',
                 '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:emit_login_prompt_ready',
                 '../third_party/cros/cros_api.gyp:cros_api',
               ],
               'actions': [
                 {
                   'action_name': 'my_proto',
                   'inputs': [
                     '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
@@ skipping 228 matching lines @@
             'browser/resources/net_internals/tabswitcherview.js',
             'browser/resources/net_internals/testview.js',
             'browser/resources/net_internals/timelineviewpainter.js',
             'browser/resources/net_internals/topmidbottomview.js',
             'browser/resources/net_internals/util.js',
             'browser/resources/net_internals/view.js',
           ]
         },
       ]
     },
+    {
+      # Protobuf compiler / generate rule for feedback
+      'target_name': 'userfeedback_proto',
+      'type': 'none',
+      'sources': [
+        'browser/userfeedback/proto/annotations.proto',
+        'browser/userfeedback/proto/common.proto',
+        'browser/userfeedback/proto/config.proto',
+        'browser/userfeedback/proto/dom.proto',
+        'browser/userfeedback/proto/extension.proto',
+        'browser/userfeedback/proto/math.proto',
+        'browser/userfeedback/proto/web.proto',
+      ],
+      'rules': [
+        {
+          'rule_name': 'genproto',
+          'extension': 'proto',
+          'inputs': [
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+          ],
+          'variables': {
+            # The protoc compiler requires a proto_path argument with the
+            # directory containing the .proto file.
+            # There's no generator variable that corresponds to this, so fake it.
+            'rule_input_relpath': 'browser/userfeedback/proto',
+          },
+          'outputs': [
+            '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.h',
+            '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
+          ],
+          'action': [
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+            '--proto_path=./<(rule_input_relpath)',
+            './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+            '--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
+          ],
+          'message': 'Generating C++ code from <(RULE_INPUT_PATH)',
+        },
+      ],
+      'dependencies': [
+        '../third_party/protobuf2/protobuf.gyp:protobuf',
+        '../third_party/protobuf2/protobuf.gyp:protoc#host',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(protoc_out_dir)',
+        ]
+      },
+      'export_dependent_settings': [
+        '../third_party/protobuf2/protobuf.gyp:protobuf',
+      ],
+     'dependencies': [
+        '../third_party/protobuf2/protobuf.gyp:protobuf',

[mal, 2010/05/14 22:28:31]

Delete these two lines: they're redefining 'dependencies' from above (line 3472)

+      ],
+    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: