Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: chrome/chrome_exe.gypi

Issue 109483003: Make sure Chrome_elf.dll imports are correct and that it the first import of chrome.exe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use swapimports.exe for maintaining import order instead of gyp twiddling Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 {
8 '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.
9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ],
11 'actions': [
12 {
13 'variables': {
14 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py',
15 'exe_input_path':'$(OutDir)\\initial',
16 'exe_output_path':'<(PRODUCT_DIR)',
17 },
18 'action_name': 'reodrer_imports',
robertshield 2014/01/09 20:55:56 nit: reorder_imports
Cait (Slow) 2014/01/10 22:00:54 Done.
19 'inputs': [
20 '<(reorder_py_path)',
21 '<(exe_input_path)',
22 '<(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
23 ],
24 'outputs': [
25 '<(PRODUCT_DIR)\\chrome.exe',
26 '<(PRODUCT_DIR)\\chrome.exe.pdb',
27 ],
28 'action': [
29 'python',
30 '<(reorder_py_path)',
31 '-i', '<(exe_input_path)',
32 '-o', '<(exe_output_path)',
33 ],
34 'message': 'Reordering Imports',
35 },
36 ],
37 },
7 { 38 {
8 'target_name': 'chrome', 39 'target_name': 'chrome_initial',
40 '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?
9 'type': 'executable', 41 'type': 'executable',
10 'mac_bundle': 1, 42 'mac_bundle': 1,
11 'variables': { 43 'variables': {
12 'use_system_xdg_utils%': 0, 44 'use_system_xdg_utils%': 0,
13 'enable_wexit_time_destructors': 1, 45 'enable_wexit_time_destructors': 1,
14 }, 46 },
15 'sources': [ 47 'sources': [
16 'app/chrome_exe_main_aura.cc', 48 'app/chrome_exe_main_aura.cc',
17 'app/chrome_exe_main_gtk.cc', 49 'app/chrome_exe_main_gtk.cc',
18 'app/chrome_exe_main_mac.cc', 50 'app/chrome_exe_main_mac.cc',
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 '../components/nacl.gyp:nacl_helper', 493 '../components/nacl.gyp:nacl_helper',
462 ], 494 ],
463 }], 495 }],
464 ], 496 ],
465 'dependencies': [ 497 'dependencies': [
466 '../sandbox/sandbox.gyp:sandbox', 498 '../sandbox/sandbox.gyp:sandbox',
467 ], 499 ],
468 }], 500 }],
469 ['OS=="win"', { 501 ['OS=="win"', {
470 'dependencies': [ 502 'dependencies': [
471 # Note that chrome_elf must be listed first. Do not reorder it.
472 '../chrome_elf/chrome_elf.gyp:chrome_elf',
473 'chrome_dll', 503 'chrome_dll',
474 'chrome_nacl_win64', 504 'chrome_nacl_win64',
475 'chrome_process_finder', 505 'chrome_process_finder',
476 'chrome_version_resources', 506 'chrome_version_resources',
477 'installer_util', 507 'installer_util',
478 'image_pre_reader', 508 'image_pre_reader',
479 '../base/base.gyp:base', 509 '../base/base.gyp:base',
480 '../breakpad/breakpad.gyp:breakpad_handler', 510 '../breakpad/breakpad.gyp:breakpad_handler',
481 '../breakpad/breakpad.gyp:breakpad_sender', 511 '../breakpad/breakpad.gyp:breakpad_sender',
482 '../components/components.gyp:breakpad_component', 512 '../components/components.gyp:breakpad_component',
483 '../components/components.gyp:policy', 513 '../components/components.gyp:policy',
514 '../chrome_elf/chrome_elf.gyp:chrome_elf',
484 '../sandbox/sandbox.gyp:sandbox', 515 '../sandbox/sandbox.gyp:sandbox',
485 ], 516 ],
486 'sources': [ 517 'sources': [
487 'app/chrome_breakpad_client.cc', 518 'app/chrome_breakpad_client.cc',
488 'app/chrome_breakpad_client.h', 519 'app/chrome_breakpad_client.h',
489 'app/chrome_exe.rc', 520 'app/chrome_exe.rc',
490 'common/crash_keys.cc', 521 'common/crash_keys.cc',
491 'common/crash_keys.h', 522 'common/crash_keys.h',
492 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 523 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
493 ], 524 ],
494 'msvs_settings': { 525 'msvs_settings': {
495 'VCLinkerTool': { 526 'VCLinkerTool': {
496 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 527 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
528 'OutputFile': '$(OutDir)\\initial\\chrome.exe',
497 'DelayLoadDLLs': [ 529 'DelayLoadDLLs': [
498 'dbghelp.dll', 530 'dbghelp.dll',
499 'dwmapi.dll', 531 'dwmapi.dll',
500 'uxtheme.dll', 532 'uxtheme.dll',
501 'ole32.dll', 533 'ole32.dll',
502 'oleaut32.dll', 534 'oleaut32.dll',
503 ], 535 ],
504 'AdditionalDependencies': [ 'wintrust.lib' ], 536 'AdditionalDependencies': [ 'wintrust.lib' ],
505 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. 537 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
506 'SubSystem': '2', 538 'SubSystem': '2',
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 'dependencies': [ 687 'dependencies': [
656 'chrome_nacl_win64', 688 'chrome_nacl_win64',
657 ], 689 ],
658 }], 690 }],
659 ], 691 ],
660 }, 692 },
661 ], 693 ],
662 }], 694 }],
663 ], 695 ],
664 } 696 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698