Chromium Code Reviews| Index: components/startup_metric_utils.gypi |
| diff --git a/components/startup_metric_utils.gypi b/components/startup_metric_utils.gypi |
| index f70e7a0fbbe050d8224b4a1640fab4bf1ad8290d..a94ec78b69afd597c6cc79cf05589d12b23ceb53 100644 |
| --- a/components/startup_metric_utils.gypi |
| +++ b/components/startup_metric_utils.gypi |
| @@ -2,10 +2,14 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| +# We have 2 separate browser targets because //components/html_viewer requires |
| +# _utils, but has symbols that conflict with mojo symbols that _message_filter |
| +# indirectly depends on. |
| + |
| { |
| 'targets': [ |
| { |
| - 'target_name': 'startup_metric_utils_browser', |
| + 'target_name': 'startup_metric_utils_browser_utils', |
|
gab
2015/11/06 18:05:17
I prefer keeping "startup_metric_utils_browser", a
fdoray
2015/11/09 15:53:56
Done.
|
| 'type': 'static_library', |
| 'dependencies': [ |
| '../base/base.gyp:base', |
| @@ -18,5 +22,37 @@ |
| 'startup_metric_utils/browser/startup_metric_utils.h', |
| ], |
| }, |
| + { |
| + 'target_name': 'startup_metric_utils_browser_message_filter', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + '../content/content.gyp:content_browser', |
| + 'startup_metric_utils_browser_utils', |
| + 'startup_metric_utils_common', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'startup_metric_utils/browser/startup_metric_message_filter.cc', |
| + 'startup_metric_utils/browser/startup_metric_message_filter.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'startup_metric_utils_common', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../ipc/ipc.gyp:ipc', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'startup_metric_utils/common/startup_metric_message_generator.cc', |
| + 'startup_metric_utils/common/startup_metric_message_generator.h', |
| + 'startup_metric_utils/common/startup_metric_messages.h', |
| + ], |
| + }, |
| ], |
| } |