| OLD | NEW |
| 1 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009-2010 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 }, { # else: Branding!="Chrome" | 394 }, { # else: Branding!="Chrome" |
| 395 # TODO: change to: | 395 # TODO: change to: |
| 396 # 'product_name': 'chromium' | 396 # 'product_name': 'chromium' |
| 397 # whenever we convert the rest of the infrastructure | 397 # whenever we convert the rest of the infrastructure |
| 398 # (buildbots etc.) to use "gyp -Dbranding=Chrome". | 398 # (buildbots etc.) to use "gyp -Dbranding=Chrome". |
| 399 # NOTE: chrome/app/theme/chromium/BRANDING and | 399 # NOTE: chrome/app/theme/chromium/BRANDING and |
| 400 # chrome/app/theme/google_chrome/BRANDING have the short names, | 400 # chrome/app/theme/google_chrome/BRANDING have the short names, |
| 401 # etc.; should we try to extract from there instead? | 401 # etc.; should we try to extract from there instead? |
| 402 'product_name': 'chrome' | 402 'product_name': 'chrome' |
| 403 }], | 403 }], |
| 404 # On Mac, this is done in chrome_dll.gypi. |
| 405 ['internal_pdf', { |
| 406 'dependencies': [ |
| 407 '../pdf/pdf.gyp:pdf', |
| 408 ], |
| 409 }], |
| 404 ], | 410 ], |
| 405 'dependencies': [ | 411 'dependencies': [ |
| 406 'packed_extra_resources', | 412 'packed_extra_resources', |
| 407 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp | 413 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp |
| 408 # file decide what to do on a per-OS basis; on Mac, internal plugins | 414 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 409 # go inside the framework, so this dependency is in chrome_dll.gypi. | 415 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 410 '../third_party/adobe/flash/flash_player.gyp:flash_player', | 416 '../third_party/adobe/flash/flash_player.gyp:flash_player', |
| 411 ], | 417 ], |
| 412 }], | 418 }], |
| 413 ['OS=="mac" or OS=="win"', { | 419 ['OS=="mac" or OS=="win"', { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 426 '../sandbox/sandbox.gyp:sandbox', | 432 '../sandbox/sandbox.gyp:sandbox', |
| 427 'app/locales/locales.gyp:*', | 433 'app/locales/locales.gyp:*', |
| 428 ], | 434 ], |
| 429 'msvs_settings': { | 435 'msvs_settings': { |
| 430 'VCLinkerTool': { | 436 'VCLinkerTool': { |
| 431 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 437 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 432 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 438 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 433 }, | 439 }, |
| 434 }, | 440 }, |
| 435 }], | 441 }], |
| 436 ['internal_pdf', { | |
| 437 'dependencies': [ | |
| 438 '../pdf/pdf.gyp:pdf', | |
| 439 ], | |
| 440 }], | |
| 441 ], | 442 ], |
| 442 }, | 443 }, |
| 443 { | 444 { |
| 444 'target_name': 'chrome_version_info', | 445 'target_name': 'chrome_version_info', |
| 445 'type': '<(library)', | 446 'type': '<(library)', |
| 446 'sources': [ | 447 'sources': [ |
| 447 'app/chrome_version_info.cc', | 448 'app/chrome_version_info.cc', |
| 448 'app/chrome_version_info.h', | 449 'app/chrome_version_info.h', |
| 449 ], | 450 ], |
| 450 'include_dirs': [ | 451 'include_dirs': [ |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 'configurations': { | 543 'configurations': { |
| 543 'Common_Base': { | 544 'Common_Base': { |
| 544 'msvs_target_platform': 'x64', | 545 'msvs_target_platform': 'x64', |
| 545 }, | 546 }, |
| 546 }, | 547 }, |
| 547 }, | 548 }, |
| 548 ], | 549 ], |
| 549 }], | 550 }], |
| 550 ], | 551 ], |
| 551 } | 552 } |
| OLD | NEW |