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

Side by Side Diff: trunk/src/chrome/chrome_exe.gypi

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

Powered by Google App Engine
This is Rietveld 408576698