| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 }], | 441 }], |
| 442 ['OS=="linux"', { | 442 ['OS=="linux"', { |
| 443 'conditions': [ | 443 'conditions': [ |
| 444 ['branding=="Chrome"', { | 444 ['branding=="Chrome"', { |
| 445 'dependencies': [ | 445 'dependencies': [ |
| 446 'linux_installer_configs', | 446 'linux_installer_configs', |
| 447 ], | 447 ], |
| 448 }], | 448 }], |
| 449 # For now, do not build nacl_helper when disable_nacl=1 | 449 # For now, do not build nacl_helper when disable_nacl=1 |
| 450 # http://code.google.com/p/gyp/issues/detail?id=239 | 450 # http://code.google.com/p/gyp/issues/detail?id=239 |
| 451 ['disable_nacl==0 and coverage==0', { | 451 ['disable_nacl==0', { |
| 452 'dependencies': [ | 452 'dependencies': [ |
| 453 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr
ap.gyp:nacl_helper_bootstrap', | 453 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr
ap.gyp:nacl_helper_bootstrap', |
| 454 '../components/nacl.gyp:nacl_helper', | 454 '../components/nacl.gyp:nacl_helper', |
| 455 ], | 455 ], |
| 456 }], | 456 }], |
| 457 ], | 457 ], |
| 458 'dependencies': [ | 458 'dependencies': [ |
| 459 '../sandbox/sandbox.gyp:sandbox', | 459 '../sandbox/sandbox.gyp:sandbox', |
| 460 ], | 460 ], |
| 461 }], | 461 }], |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 'dependencies': [ | 646 'dependencies': [ |
| 647 'chrome_nacl_win64', | 647 'chrome_nacl_win64', |
| 648 ], | 648 ], |
| 649 }], | 649 }], |
| 650 ], | 650 ], |
| 651 }, | 651 }, |
| 652 ], | 652 ], |
| 653 }], | 653 }], |
| 654 ], | 654 ], |
| 655 } | 655 } |
| OLD | NEW |