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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 114333008: Revert of Add tests to make sure ChromeELF.dll imports are correct: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome_elf/chrome_elf.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 23 matching lines...) Expand all
34 # be necessary to list app-Info.plist once, not the three times it is 34 # be necessary to list app-Info.plist once, not the three times it is
35 # listed here. 35 # listed here.
36 'mac_bundle_resources!': [ 36 'mac_bundle_resources!': [
37 'app/app-Info.plist', 37 'app/app-Info.plist',
38 ], 38 ],
39 'xcode_settings': { 39 'xcode_settings': {
40 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', 40 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
41 'INFOPLIST_FILE': 'app/app-Info.plist', 41 'INFOPLIST_FILE': 'app/app-Info.plist',
42 }, 42 },
43 'conditions': [ 43 'conditions': [
44 ['OS == "win" ', {
45 'dependencies': [
46 # Note that chrome_elf must be listed first. Do not reorder it.
47 '../chrome_elf/chrome_elf.gyp:chrome_elf',
48 ],
49 }],
50 ['component == "shared_library"', { 44 ['component == "shared_library"', {
51 'variables': { 45 'variables': {
52 'win_use_external_manifest': 1, 46 'win_use_external_manifest': 1,
53 }, 47 },
54 }], 48 }],
55 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { 49 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', {
56 'dependencies' : [ 50 'dependencies' : [
57 '../tools/cygprofile/cygprofile.gyp:cygprofile', 51 '../tools/cygprofile/cygprofile.gyp:cygprofile',
58 ], 52 ],
59 }], 53 }],
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 '../components/nacl.gyp:nacl_helper', 461 '../components/nacl.gyp:nacl_helper',
468 ], 462 ],
469 }], 463 }],
470 ], 464 ],
471 'dependencies': [ 465 'dependencies': [
472 '../sandbox/sandbox.gyp:sandbox', 466 '../sandbox/sandbox.gyp:sandbox',
473 ], 467 ],
474 }], 468 }],
475 ['OS=="win"', { 469 ['OS=="win"', {
476 'dependencies': [ 470 'dependencies': [
471 # Note that chrome_elf must be listed first. Do not reorder it.
472 '../chrome_elf/chrome_elf.gyp:chrome_elf',
477 'chrome_dll', 473 'chrome_dll',
478 'chrome_nacl_win64', 474 'chrome_nacl_win64',
479 'chrome_process_finder', 475 'chrome_process_finder',
480 'chrome_version_resources', 476 'chrome_version_resources',
481 'installer_util', 477 'installer_util',
482 'image_pre_reader', 478 'image_pre_reader',
483 '../base/base.gyp:base', 479 '../base/base.gyp:base',
484 '../breakpad/breakpad.gyp:breakpad_handler', 480 '../breakpad/breakpad.gyp:breakpad_handler',
485 '../breakpad/breakpad.gyp:breakpad_sender', 481 '../breakpad/breakpad.gyp:breakpad_sender',
486 '../components/components.gyp:breakpad_component', 482 '../components/components.gyp:breakpad_component',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 'dependencies': [ 655 'dependencies': [
660 'chrome_nacl_win64', 656 'chrome_nacl_win64',
661 ], 657 ],
662 }], 658 }],
663 ], 659 ],
664 }, 660 },
665 ], 661 ],
666 }], 662 }],
667 ], 663 ],
668 } 664 }
OLDNEW
« no previous file with comments | « no previous file | chrome_elf/chrome_elf.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698