| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'chrome', | 8 'target_name': 'chrome', |
| 9 'type': 'executable', | 9 'type': 'executable', |
| 10 'mac_bundle': 1, | 10 'mac_bundle': 1, |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 # file decide what to do on a per-OS basis; on Mac, internal plugins | 411 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 412 # go inside the framework, so this dependency is in chrome_dll.gypi. | 412 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 413 '../third_party/adobe/flash/flash_player.gyp:flash_player', | 413 '../third_party/adobe/flash/flash_player.gyp:flash_player', |
| 414 ], | 414 ], |
| 415 }], | 415 }], |
| 416 ['OS=="linux"', { | 416 ['OS=="linux"', { |
| 417 'conditions': [ | 417 'conditions': [ |
| 418 # For now, do not build nacl_helper when disable_nacl=1 | 418 # For now, do not build nacl_helper when disable_nacl=1 |
| 419 ['disable_nacl!=1', { | 419 ['disable_nacl!=1', { |
| 420 'dependencies': [ | 420 'dependencies': [ |
| 421 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr
ap.gyp:nacl_helper_bootstrap', | 421 'nacl_helper_bootstrap', |
| 422 'nacl_helper', | 422 'nacl_helper', |
| 423 ], | 423 ], |
| 424 }], | 424 }], |
| 425 ], | 425 ], |
| 426 }], | 426 }], |
| 427 ['OS=="mac"', { | 427 ['OS=="mac"', { |
| 428 'dependencies': [ | 428 'dependencies': [ |
| 429 # On Mac, make sure we've built chrome_dll, which contains all of | 429 # On Mac, make sure we've built chrome_dll, which contains all of |
| 430 # the library code with Chromium functionality. | 430 # the library code with Chromium functionality. |
| 431 'chrome_dll', | 431 'chrome_dll', |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 'configurations': { | 546 'configurations': { |
| 547 'Common_Base': { | 547 'Common_Base': { |
| 548 'msvs_target_platform': 'x64', | 548 'msvs_target_platform': 'x64', |
| 549 }, | 549 }, |
| 550 }, | 550 }, |
| 551 }, | 551 }, |
| 552 ], | 552 ], |
| 553 }], | 553 }], |
| 554 ], | 554 ], |
| 555 } | 555 } |
| OLD | NEW |