| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index 0c878b2e5500a0bd596f876beba7ffba6499885f..b222f393cc603ede06c102837f5cbf7ecaa7b200 100644
|
| --- a/chrome/chrome_exe.gypi
|
| +++ b/chrome/chrome_exe.gypi
|
| @@ -9,38 +9,6 @@
|
| 'target_name': 'chrome',
|
| 'type': 'none',
|
| 'dependencies': [ 'chrome_initial', ],
|
| - 'conditions': [
|
| - ['OS == "win"', {
|
| - 'actions': [
|
| - {
|
| - 'variables': {
|
| - 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py',
|
| - # See comment in chrome_dll.gypi in the hardlink_to_output
|
| - # target for why this cannot be 'initial' like the DLL.
|
| - 'exe_input_path':'$(OutDir)\\initialexe',
|
| - 'exe_output_path':'<(PRODUCT_DIR)',
|
| - },
|
| - 'action_name': 'reorder_imports',
|
| - 'inputs': [
|
| - '<(reorder_py_path)',
|
| - '$(OutDir)\\initialexe\\chrome.exe',
|
| - ],
|
| - 'outputs': [
|
| - '<(PRODUCT_DIR)\\chrome.exe',
|
| - '<(PRODUCT_DIR)\\chrome.exe.pdb',
|
| - ],
|
| - 'action': [
|
| - 'python',
|
| - '<(reorder_py_path)',
|
| - '-i', '<(exe_input_path)',
|
| - '-o', '<(exe_output_path)',
|
| - '-a', '<(target_arch)',
|
| - ],
|
| - 'message': 'Reordering Imports',
|
| - },
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| {
|
| # GN version: //chrome:chrome_initial
|
| @@ -60,7 +28,6 @@
|
| 'sources': [
|
| # Note that due to InitializeSandboxInfo, this must be directly linked
|
| # into chrome.exe, not into a dependent.
|
| - '<(DEPTH)/content/app/sandbox_helper_win.cc',
|
| '<(DEPTH)/content/public/common/content_switches.cc',
|
| 'app/chrome_exe_load_config_win.cc',
|
| 'app/chrome_exe_main_aura.cc',
|
| @@ -414,7 +381,6 @@
|
| '../crypto/crypto.gyp:crypto',
|
| '../breakpad/breakpad.gyp:breakpad_handler',
|
| '../breakpad/breakpad.gyp:breakpad_sender',
|
| - '../chrome_elf/chrome_elf.gyp:chrome_elf',
|
| '../components/components.gyp:crash_component',
|
| '../components/components.gyp:crash_core_common',
|
| '../components/components.gyp:flags_ui_switches',
|
| @@ -518,9 +484,6 @@
|
| 'type': 'executable',
|
| 'product_name': 'nacl64',
|
| 'sources': [
|
| - '../content/app/sandbox_helper_win.cc',
|
| - '../content/common/sandbox_init_win.cc',
|
| - '../content/common/sandbox_win.cc',
|
| '../content/public/common/content_switches.cc',
|
| '../content/public/common/sandboxed_process_launcher_delegate.cc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc',
|
| @@ -545,7 +508,6 @@
|
| '../components/nacl.gyp:nacl_win64',
|
| '../crypto/crypto.gyp:crypto_nacl_win64',
|
| '../ipc/ipc.gyp:ipc_win64',
|
| - '../sandbox/sandbox.gyp:sandbox_win64',
|
| '../third_party/kasko/kasko.gyp:kasko_features',
|
| ],
|
| 'defines': [
|
|
|