| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 'targets': [ | 141 'targets': [ |
| 142 { | 142 { |
| 143 'target_name': 'chrome', | 143 'target_name': 'chrome', |
| 144 'type': 'executable', | 144 'type': 'executable', |
| 145 'mac_bundle': 1, | 145 'mac_bundle': 1, |
| 146 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', | 146 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', |
| 147 'variables': { | 147 'variables': { |
| 148 'chrome_exe_target': 1, | 148 'chrome_exe_target': 1, |
| 149 'use_system_xdg_utils%': 0, | 149 'use_system_xdg_utils%': 0, |
| 150 }, | 150 }, |
| 151 'copies': [ | |
| 152 { | |
| 153 'destination': '<(PRODUCT_DIR)', | |
| 154 'files': [ | |
| 155 '../native_client/irt_binaries/nacl_irt_x86_32.nexe', | |
| 156 '../native_client/irt_binaries/nacl_irt_x86_64.nexe', | |
| 157 ], | |
| 158 }, | |
| 159 ], | |
| 160 'conditions': [ | 151 'conditions': [ |
| 161 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { | 152 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 162 'actions': [ | 153 'actions': [ |
| 163 { | 154 { |
| 164 'action_name': 'manpage', | 155 'action_name': 'manpage', |
| 165 'conditions': [ | 156 'conditions': [ |
| 166 [ 'branding == "Chrome"', { | 157 [ 'branding == "Chrome"', { |
| 167 'variables': { | 158 'variables': { |
| 168 'name': 'Google Chrome', | 159 'name': 'Google Chrome', |
| 169 'filename': 'google-chrome', | 160 'filename': 'google-chrome', |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 'app/locales/locales.gyp:*', | 456 'app/locales/locales.gyp:*', |
| 466 'app/policy/cloud_policy_codegen.gyp:policy', | 457 'app/policy/cloud_policy_codegen.gyp:policy', |
| 467 ], | 458 ], |
| 468 'msvs_settings': { | 459 'msvs_settings': { |
| 469 'VCLinkerTool': { | 460 'VCLinkerTool': { |
| 470 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 461 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 471 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 462 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 472 }, | 463 }, |
| 473 }, | 464 }, |
| 474 }], | 465 }], |
| 466 ['disable_nacl!=1', { |
| 467 'copies': [ |
| 468 { |
| 469 'destination': '<(PRODUCT_DIR)', |
| 470 'files': [ |
| 471 '../native_client/irt_binaries/nacl_irt_x86_32.nexe', |
| 472 '../native_client/irt_binaries/nacl_irt_x86_64.nexe', |
| 473 ], |
| 474 }, |
| 475 ], |
| 476 }], |
| 475 ], | 477 ], |
| 476 }, | 478 }, |
| 477 { | 479 { |
| 478 'target_name': 'chrome_mesa', | 480 'target_name': 'chrome_mesa', |
| 479 'type': 'none', | 481 'type': 'none', |
| 480 'dependencies': [ | 482 'dependencies': [ |
| 481 'chrome', | 483 'chrome', |
| 482 '../third_party/mesa/mesa.gyp:osmesa', | 484 '../third_party/mesa/mesa.gyp:osmesa', |
| 483 ], | 485 ], |
| 484 'conditions': [ | 486 'conditions': [ |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 'configurations': { | 532 'configurations': { |
| 531 'Common_Base': { | 533 'Common_Base': { |
| 532 'msvs_target_platform': 'x64', | 534 'msvs_target_platform': 'x64', |
| 533 }, | 535 }, |
| 534 }, | 536 }, |
| 535 }, | 537 }, |
| 536 ], | 538 ], |
| 537 }], | 539 }], |
| 538 ], | 540 ], |
| 539 } | 541 } |
| OLD | NEW |