Chromium Code Reviews| Index: chrome/chrome_exe.gypi |
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi |
| index 0c878b2e5500a0bd596f876beba7ffba6499885f..7dd6e9e24bbe2539a719ce2fcd230066acafc25c 100644 |
| --- a/chrome/chrome_exe.gypi |
| +++ b/chrome/chrome_exe.gypi |
| @@ -98,23 +98,6 @@ |
| }], |
| ] |
| }], |
| - ['OS == "win"', { |
|
gab
2016/04/12 19:21:08
Duplicate condition, merged with other one below.
|
| - 'dependencies': [ |
| - 'chrome_watcher', |
| - 'chrome_watcher_client', |
| - '../components/components.gyp:browser_watcher_client', |
| - '../components/components.gyp:crash_component', |
| - ], |
| - 'sources': [ |
| - 'app/chrome_crash_reporter_client.cc', |
| - 'app/chrome_crash_reporter_client.h', |
| - ], |
| - 'conditions': [ |
| - ['win_console_app==1', { |
| - 'defines': ['WIN_CONSOLE_APP'], |
| - }], |
| - ], |
| - }], |
| ['OS == "android"', { |
| # Don't put the 'chrome' target in 'all' on android |
| 'suppress_wildcard': 1, |
| @@ -408,18 +391,24 @@ |
| 'chrome_nacl_win64', |
| 'chrome_process_finder', |
| 'chrome_version_resources', |
| - 'installer_util', |
| + 'chrome_watcher', |
| + 'chrome_watcher_client', |
| + 'common_constants', |
|
gab
2016/04/12 19:21:08
GYP-side of " Adding previously missing 'common_co
|
| 'file_pre_reader', |
| + 'installer_util', |
| + 'metrics_constants_util_win', |
| '../base/base.gyp:base', |
| - '../crypto/crypto.gyp:crypto', |
| '../breakpad/breakpad.gyp:breakpad_handler', |
| '../breakpad/breakpad.gyp:breakpad_sender', |
| '../chrome_elf/chrome_elf.gyp:chrome_elf', |
| + '../components/components.gyp:browser_watcher_client', |
| + '../components/components.gyp:crash_component', |
| '../components/components.gyp:crash_component', |
| '../components/components.gyp:crash_core_common', |
| '../components/components.gyp:flags_ui_switches', |
| '../components/components.gyp:policy', |
| '../components/components.gyp:startup_metric_utils_common', |
| + '../crypto/crypto.gyp:crypto', |
| '../sandbox/sandbox.gyp:sandbox', |
| '../third_party/kasko/kasko.gyp:kasko_features', |
| '../ui/gfx/gfx.gyp:gfx', |
| @@ -427,6 +416,8 @@ |
| ], |
| 'sources': [ |
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', |
| + 'app/chrome_crash_reporter_client.cc', |
| + 'app/chrome_crash_reporter_client.h', |
| 'app/chrome_exe.rc', |
| 'common/crash_keys.cc', |
| 'common/crash_keys.h', |
| @@ -451,6 +442,9 @@ |
| # console build has been requested. |
| 'SubSystem': '2', |
| }], |
| + ['win_console_app==1', { |
| + 'defines': ['WIN_CONSOLE_APP'], |
| + }], |
| ], |
| }, |
| 'VCManifestTool': { |