| OLD | NEW |
| 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', | 448 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', |
| 449 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp | 449 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp |
| 450 # file decide what to do on a per-OS basis; on Mac, internal plugins | 450 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 451 # go inside the framework, so this dependency is in chrome_dll.gypi. | 451 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 452 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', | 452 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', |
| 453 ], | 453 ], |
| 454 }], | 454 }], |
| 455 ['chrome_multiple_dll', { | 455 ['chrome_multiple_dll', { |
| 456 'defines': ['CHROME_MULTIPLE_DLL'], | 456 'defines': ['CHROME_MULTIPLE_DLL'], |
| 457 }], | 457 }], |
| 458 ['OS=="mac" and asan==1', { | |
| 459 'xcode_settings': { | |
| 460 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE. | |
| 461 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', | |
| 462 }, | |
| 463 }], | |
| 464 ['OS=="linux"', { | 458 ['OS=="linux"', { |
| 465 'conditions': [ | 459 'conditions': [ |
| 466 ['branding=="Chrome"', { | 460 ['branding=="Chrome"', { |
| 467 'dependencies': [ | 461 'dependencies': [ |
| 468 'linux_installer_configs', | 462 'linux_installer_configs', |
| 469 ], | 463 ], |
| 470 }], | 464 }], |
| 471 # For now, do not build nacl_helper when disable_nacl=1 | 465 # For now, do not build nacl_helper when disable_nacl=1 |
| 472 # http://code.google.com/p/gyp/issues/detail?id=239 | 466 # http://code.google.com/p/gyp/issues/detail?id=239 |
| 473 ['disable_nacl==0', { | 467 ['disable_nacl==0', { |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |