| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', | 436 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', |
| 437 }, | 437 }, |
| 438 }], | 438 }], |
| 439 ['OS=="linux"', { | 439 ['OS=="linux"', { |
| 440 'conditions': [ | 440 'conditions': [ |
| 441 ['branding=="Chrome"', { | 441 ['branding=="Chrome"', { |
| 442 'dependencies': [ | 442 'dependencies': [ |
| 443 'linux_installer_configs', | 443 'linux_installer_configs', |
| 444 ], | 444 ], |
| 445 }], | 445 }], |
| 446 ['selinux==0', { | |
| 447 'dependencies': [ | |
| 448 '../sandbox/sandbox.gyp:sandbox', | |
| 449 ], | |
| 450 }], | |
| 451 # For now, do not build nacl_helper when disable_nacl=1 | 446 # For now, do not build nacl_helper when disable_nacl=1 |
| 452 # http://code.google.com/p/gyp/issues/detail?id=239 | 447 # http://code.google.com/p/gyp/issues/detail?id=239 |
| 453 ['disable_nacl==0 and coverage==0', { | 448 ['disable_nacl==0 and coverage==0', { |
| 454 'dependencies': [ | 449 'dependencies': [ |
| 455 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr
ap.gyp:nacl_helper_bootstrap', | 450 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr
ap.gyp:nacl_helper_bootstrap', |
| 456 'nacl_helper', | 451 'nacl_helper', |
| 457 ], | 452 ], |
| 458 }], | 453 }], |
| 459 ], | 454 ], |
| 455 'dependencies': [ |
| 456 '../sandbox/sandbox.gyp:sandbox', |
| 457 ], |
| 460 }], | 458 }], |
| 461 ['OS=="win"', { | 459 ['OS=="win"', { |
| 462 'dependencies': [ | 460 'dependencies': [ |
| 463 'chrome_dll', | 461 'chrome_dll', |
| 464 'chrome_nacl_win64', | 462 'chrome_nacl_win64', |
| 465 'chrome_version_resources', | 463 'chrome_version_resources', |
| 466 'installer_util', | 464 'installer_util', |
| 467 'image_pre_reader', | 465 'image_pre_reader', |
| 468 '../base/base.gyp:base', | 466 '../base/base.gyp:base', |
| 469 '../breakpad/breakpad.gyp:breakpad_handler', | 467 '../breakpad/breakpad.gyp:breakpad_handler', |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 'dependencies': [ | 623 'dependencies': [ |
| 626 'chrome_nacl_win64', | 624 'chrome_nacl_win64', |
| 627 ], | 625 ], |
| 628 }], | 626 }], |
| 629 ], | 627 ], |
| 630 }, | 628 }, |
| 631 ], | 629 ], |
| 632 }], | 630 }], |
| 633 ], | 631 ], |
| 634 } | 632 } |
| OLD | NEW |