| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index 534f0c8df8c5abb57a241a77e80a6ced1931b468..930c839ea886a77995d7b7211e5da7193f7c4400 100644
|
| --- a/chrome/chrome_exe.gypi
|
| +++ b/chrome/chrome_exe.gypi
|
| @@ -98,23 +98,6 @@
|
| }],
|
| ]
|
| }],
|
| - ['OS == "win"', {
|
| - '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,
|
| @@ -409,18 +392,23 @@
|
| 'chrome_nacl_win64',
|
| 'chrome_process_finder',
|
| 'chrome_version_resources',
|
| - 'installer_util',
|
| + 'chrome_watcher',
|
| + 'chrome_watcher_client',
|
| '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/common_constants.gyp:common_constants',
|
| '../chrome_elf/chrome_elf.gyp:chrome_elf',
|
| + '../components/components.gyp:browser_watcher_client',
|
| '../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',
|
| @@ -428,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',
|
| @@ -436,6 +426,11 @@
|
| # We still want the _win entry point for sandbox, etc.
|
| 'app/chrome_exe_main_aura.cc',
|
| ],
|
| + 'conditions': [
|
| + ['win_console_app==1', {
|
| + 'defines': ['WIN_CONSOLE_APP'],
|
| + }],
|
| + ],
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| 'OutputFile': '$(OutDir)\\initialexe\\chrome.exe',
|
|
|