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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 8685001: Remove the Syzygy optimization alternative from GYP configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« chrome/chrome_dll.gypi ('K') | « chrome/chrome_dll_syzygy.gypi ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 'chrome_dll', 427 'chrome_dll',
428 ], 428 ],
429 }], 429 }],
430 ['OS=="mac" and asan==1', { 430 ['OS=="mac" and asan==1', {
431 'xcode_settings': { 431 'xcode_settings': {
432 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE. 432 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
433 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', 433 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
434 }, 434 },
435 }], 435 }],
436 ['OS=="win"', { 436 ['OS=="win"', {
437 'conditions': [
438 ['optimize_with_syzygy==1', {
439 # With syzygy enabled there is an intermediate target which
440 # builds an initial version of chrome_dll, then optimizes it
441 # to its final location. The optimization step also
442 # depends on chrome_exe, so here we depend on the initial
443 # chrome_dll.
444 'dependencies': ['chrome_dll_initial',]
445 }, {
446 'dependencies': ['chrome_dll',]
447 }],
448 ],
449 'dependencies': [ 437 'dependencies': [
438 'chrome_dll',
450 'chrome_version_resources', 439 'chrome_version_resources',
451 'installer_util', 440 'installer_util',
452 'installer_util_strings', 441 'installer_util_strings',
453 '../base/base.gyp:base', 442 '../base/base.gyp:base',
454 '../breakpad/breakpad.gyp:breakpad_handler', 443 '../breakpad/breakpad.gyp:breakpad_handler',
455 '../breakpad/breakpad.gyp:breakpad_sender', 444 '../breakpad/breakpad.gyp:breakpad_sender',
456 '../sandbox/sandbox.gyp:sandbox', 445 '../sandbox/sandbox.gyp:sandbox',
457 'app/policy/cloud_policy_codegen.gyp:policy', 446 'app/policy/cloud_policy_codegen.gyp:policy',
458 ], 447 ],
459 'sources': [ 448 'sources': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 'configurations': { 542 'configurations': {
554 'Common_Base': { 543 'Common_Base': {
555 'msvs_target_platform': 'x64', 544 'msvs_target_platform': 'x64',
556 }, 545 },
557 }, 546 },
558 }, 547 },
559 ], 548 ],
560 }], 549 }],
561 ], 550 ],
562 } 551 }
OLDNEW
« chrome/chrome_dll.gypi ('K') | « chrome/chrome_dll_syzygy.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698