| 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 }], | 413 }], |
| 414 ['selinux==0', { | 414 ['selinux==0', { |
| 415 'dependencies': [ | 415 'dependencies': [ |
| 416 '../sandbox/sandbox.gyp:sandbox', | 416 '../sandbox/sandbox.gyp:sandbox', |
| 417 ], | 417 ], |
| 418 }], | 418 }], |
| 419 ], | 419 ], |
| 420 }], | 420 }], |
| 421 ['OS != "mac"', { | 421 ['OS != "mac"', { |
| 422 'conditions': [ | 422 'conditions': [ |
| 423 ['branding=="Chrome"', { | 423 # TODO: add a: |
| 424 'product_name': 'chrome' | 424 # 'product_name': 'chromium' |
| 425 }, { # else: Branding!="Chrome" | 425 # whenever we convert the rest of the infrastructure |
| 426 # TODO: change to: | 426 # (buildbots etc.) to understand the branding gyp define. |
| 427 # 'product_name': 'chromium' | 427 # NOTE: chrome/app/theme/chromium/BRANDING and |
| 428 # whenever we convert the rest of the infrastructure | 428 # chrome/app/theme/google_chrome/BRANDING have the short name |
| 429 # (buildbots etc.) to use "gyp -Dbranding=Chrome". | 429 # "chrome" etc.; should we try to extract from there instead? |
| 430 # NOTE: chrome/app/theme/chromium/BRANDING and | 430 |
| 431 # chrome/app/theme/google_chrome/BRANDING have the short names, | |
| 432 # etc.; should we try to extract from there instead? | |
| 433 'product_name': 'chrome' | |
| 434 }], | |
| 435 # On Mac, this is done in chrome_dll.gypi. | 431 # On Mac, this is done in chrome_dll.gypi. |
| 436 ['internal_pdf', { | 432 ['internal_pdf', { |
| 437 'dependencies': [ | 433 'dependencies': [ |
| 438 '../pdf/pdf.gyp:pdf', | 434 '../pdf/pdf.gyp:pdf', |
| 439 ], | 435 ], |
| 440 }], | 436 }], |
| 441 ], | 437 ], |
| 442 'dependencies': [ | 438 'dependencies': [ |
| 443 'packed_extra_resources', | 439 'packed_extra_resources', |
| 444 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp | 440 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 'configurations': { | 510 'configurations': { |
| 515 'Common_Base': { | 511 'Common_Base': { |
| 516 'msvs_target_platform': 'x64', | 512 'msvs_target_platform': 'x64', |
| 517 }, | 513 }, |
| 518 }, | 514 }, |
| 519 }, | 515 }, |
| 520 ], | 516 ], |
| 521 }], | 517 }], |
| 522 ], | 518 ], |
| 523 } | 519 } |
| OLD | NEW |