Chromium Code Reviews| Index: chrome/chrome_exe.gypi |
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi |
| index f694ae0dfa1759aad4bc7de5a890da050421bf36..6a93a3aaddb64dc0ebf1e219ebfd86b49aee3c42 100644 |
| --- a/chrome/chrome_exe.gypi |
| +++ b/chrome/chrome_exe.gypi |
| @@ -4,8 +4,40 @@ |
| { |
| 'targets': [ |
| - { |
| + { |
| 'target_name': 'chrome', |
|
robertshield
2014/01/09 20:55:56
This should be windows-only right?
Cait (Slow)
2014/01/10 22:00:54
Done.
|
| + 'type': 'none', |
| + 'dependencies': [ 'chrome_initial', ], |
| + 'actions': [ |
| + { |
| + 'variables': { |
| + 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py', |
| + 'exe_input_path':'$(OutDir)\\initial', |
| + 'exe_output_path':'<(PRODUCT_DIR)', |
| + }, |
| + 'action_name': 'reodrer_imports', |
|
robertshield
2014/01/09 20:55:56
nit: reorder_imports
Cait (Slow)
2014/01/10 22:00:54
Done.
|
| + 'inputs': [ |
| + '<(reorder_py_path)', |
| + '<(exe_input_path)', |
| + '<(exe_output_path)', |
|
robertshield
2014/01/09 20:55:56
just curious: why does this last one need to be an
Cait (Slow)
2014/01/10 22:00:54
it doesn't...in fact, it breaks things (passing th
|
| + ], |
| + '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', |
|
robertshield
2014/01/09 20:55:56
just curious again: what does 'product_name' do?
Cait (Slow)
2014/01/10 22:00:54
product_name makes it chrome.exe rather than chrom
robertshield
2014/01/11 02:16:07
Ok, makes sense. Perhaps a comment to this effect?
|
| 'type': 'executable', |
| 'mac_bundle': 1, |
| 'variables': { |
| @@ -468,8 +500,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 +511,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 +525,7 @@ |
| 'msvs_settings': { |
| 'VCLinkerTool': { |
| 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| + 'OutputFile': '$(OutDir)\\initial\\chrome.exe', |
| 'DelayLoadDLLs': [ |
| 'dbghelp.dll', |
| 'dwmapi.dll', |