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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 517803004: Reland https://codereview.chromium.org/298333007/: Enable mac_strip_release under ASan on OSX. Remo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chrome/chrome.gyp ('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) 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': 'none', 9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ], 10 'dependencies': [ 'chrome_initial', ],
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', 451 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
452 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 452 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
453 # file decide what to do on a per-OS basis; on Mac, internal plugins 453 # file decide what to do on a per-OS basis; on Mac, internal plugins
454 # go inside the framework, so this dependency is in chrome_dll.gypi. 454 # go inside the framework, so this dependency is in chrome_dll.gypi.
455 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', 455 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
456 ], 456 ],
457 }], 457 }],
458 ['chrome_multiple_dll', { 458 ['chrome_multiple_dll', {
459 'defines': ['CHROME_MULTIPLE_DLL'], 459 'defines': ['CHROME_MULTIPLE_DLL'],
460 }], 460 }],
461 ['OS=="mac" and asan==1', {
462 'xcode_settings': {
463 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
464 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
465 },
466 }],
467 ['OS=="linux"', { 461 ['OS=="linux"', {
468 'conditions': [ 462 'conditions': [
469 ['branding=="Chrome"', { 463 ['branding=="Chrome"', {
470 'dependencies': [ 464 'dependencies': [
471 'linux_installer_configs', 465 'linux_installer_configs',
472 ], 466 ],
473 }], 467 }],
474 # For now, do not build nacl_helper when disable_nacl=1 468 # For now, do not build nacl_helper when disable_nacl=1
475 # http://code.google.com/p/gyp/issues/detail?id=239 469 # http://code.google.com/p/gyp/issues/detail?id=239
476 ['disable_nacl==0', { 470 ['disable_nacl==0', {
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 'dependencies': [ 688 'dependencies': [
695 'chrome_nacl_win64', 689 'chrome_nacl_win64',
696 ], 690 ],
697 }], 691 }],
698 ], 692 ],
699 }, 693 },
700 ], 694 ],
701 }], 695 }],
702 ], 696 ],
703 } 697 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698