| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index 52c06d88134ff0ec60badf8e3117cb6512176fec..17b696975170b0ea4c0db95bd15f3fbc538c8eda 100644
|
| --- a/chrome/chrome_exe.gypi
|
| +++ b/chrome/chrome_exe.gypi
|
| @@ -6,6 +6,40 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'chrome',
|
| + 'type': 'none',
|
| + 'dependencies': [ 'chrome_initial', ],
|
| + 'conditions': [
|
| + ['OS == "win"', {
|
| + 'actions': [
|
| + {
|
| + 'variables': {
|
| + 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py',
|
| + 'exe_input_path':'$(OutDir)\\initial',
|
| + 'exe_output_path':'<(PRODUCT_DIR)',
|
| + },
|
| + 'action_name': 'reorder_imports',
|
| + 'inputs': [
|
| + '<(reorder_py_path)',
|
| + ],
|
| + 'outputs': [
|
| + '<(PRODUCT_DIR)\\chrome.exe',
|
| + '<(PRODUCT_DIR)\\chrome.exe.pdb',
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + '<(reorder_py_path)',
|
| + '-i', '<(exe_input_path)',
|
| + '-o', '<(exe_output_path)',
|
| + ],
|
| + 'message': 'Reordering Imports',
|
| + },
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'chrome_initial',
|
| + 'product_name': 'chrome',
|
| 'type': 'executable',
|
| 'mac_bundle': 1,
|
| 'variables': {
|
| @@ -468,8 +502,6 @@
|
| }],
|
| ['OS=="win"', {
|
| 'dependencies': [
|
| - # Note that chrome_elf must be listed first. Do not reorder it.
|
| - '../chrome_elf/chrome_elf.gyp:chrome_elf',
|
| 'chrome_dll',
|
| 'chrome_nacl_win64',
|
| 'chrome_process_finder',
|
| @@ -481,6 +513,7 @@
|
| '../breakpad/breakpad.gyp:breakpad_sender',
|
| '../components/components.gyp:breakpad_component',
|
| '../components/components.gyp:policy',
|
| + '../chrome_elf/chrome_elf.gyp:chrome_elf',
|
| '../sandbox/sandbox.gyp:sandbox',
|
| ],
|
| 'sources': [
|
| @@ -494,6 +527,7 @@
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
|
| + 'OutputFile': '$(OutDir)\\initial\\chrome.exe',
|
| 'DelayLoadDLLs': [
|
| 'dbghelp.dll',
|
| 'dwmapi.dll',
|
|
|