| OLD | NEW |
| 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'chrome_exe_target': 0, | 8 'chrome_exe_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 ], | 408 ], |
| 409 'dependencies': [ | 409 'dependencies': [ |
| 410 'packed_extra_resources', | 410 'packed_extra_resources', |
| 411 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp | 411 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp |
| 412 # file decide what to do on a per-OS basis; on Mac, internal plugins | 412 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 413 # go inside the framework, so this dependency is in chrome_dll.gypi. | 413 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 414 '../third_party/adobe/flash/flash_player.gyp:flash_player', | 414 '../third_party/adobe/flash/flash_player.gyp:flash_player', |
| 415 ], | 415 ], |
| 416 }], | 416 }], |
| 417 ['OS=="mac" or OS=="win"', { | 417 ['OS=="mac" or OS=="win"', { |
| 418 'dependencies': [ | 418 'conditions': [ |
| 419 # On Windows and Mac, make sure we've built chrome_dll, which | 419 ['OS=="win" and optimize_with_syzygy==1', { |
| 420 # contains all of the library code with Chromium functionality. | 420 'dependencies': [ |
| 421 'chrome_dll', | 421 # When syzygy is enabled on Windows, make sure we've built the |
| 422 # original chrome_dll, so that the optimize step can run. The |
| 423 # optimization step will generate the final chrome_dll. |
| 424 'original_chrome_dll', |
| 425 ], |
| 426 }, { |
| 427 'dependencies': [ |
| 428 # On Windows and Mac, make sure we've built chrome_dll, which |
| 429 # contains all of the library code with Chromium functionality. |
| 430 'chrome_dll', |
| 431 ], |
| 432 }], |
| 422 ], | 433 ], |
| 423 }], | 434 }], |
| 424 ['OS=="win"', { | 435 ['OS=="win"', { |
| 425 'dependencies': [ | 436 'dependencies': [ |
| 426 'chrome_version_resources', | 437 'chrome_version_resources', |
| 427 'installer_util', | 438 'installer_util', |
| 428 'installer_util_strings', | 439 'installer_util_strings', |
| 429 '../base/base.gyp:base', | 440 '../base/base.gyp:base', |
| 430 '../breakpad/breakpad.gyp:breakpad_handler', | 441 '../breakpad/breakpad.gyp:breakpad_handler', |
| 431 '../breakpad/breakpad.gyp:breakpad_sender', | 442 '../breakpad/breakpad.gyp:breakpad_sender', |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 'configurations': { | 501 'configurations': { |
| 491 'Common_Base': { | 502 'Common_Base': { |
| 492 'msvs_target_platform': 'x64', | 503 'msvs_target_platform': 'x64', |
| 493 }, | 504 }, |
| 494 }, | 505 }, |
| 495 }, | 506 }, |
| 496 ], | 507 ], |
| 497 }], | 508 }], |
| 498 ], | 509 ], |
| 499 } | 510 } |
| OLD | NEW |