Chromium Code Reviews| 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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 608 'targets': [ | 608 'targets': [ |
| 609 { | 609 { |
| 610 'target_name': 'chrome_nacl_win64', | 610 'target_name': 'chrome_nacl_win64', |
| 611 'type': 'none', | 611 'type': 'none', |
| 612 'sources': [], | 612 'sources': [], |
| 613 }, | 613 }, |
| 614 ], | 614 ], |
| 615 }], | 615 }], |
| 616 ], | 616 ], |
| 617 }], | 617 }], |
| 618 ['OS=="linux"', { | |
| 619 'targets': [ | |
| 620 { | |
| 621 'target_name': 'nacl_helper', | |
|
Mark Seaborn
2013/07/31 17:16:32
I'd rather keep the definition of nacl_helper unde
yael.aharon1
2013/07/31 17:24:38
Are you suggesting a new gypi file under chrome/na
Mark Seaborn
2013/07/31 17:53:53
No, I'm just suggesting keeping chrome/nacl/nacl.g
| |
| 622 'type': 'executable', | |
| 623 'include_dirs': [ | |
| 624 '..', | |
| 625 ], | |
| 626 'dependencies': [ | |
| 627 'nacl', | |
| 628 '../components/nacl_common.gyp:nacl_common', | |
| 629 '../crypto/crypto.gyp:crypto', | |
| 630 '../sandbox/sandbox.gyp:libc_urandom_override', | |
| 631 '../sandbox/sandbox.gyp:sandbox', | |
| 632 ], | |
| 633 'sources': [ | |
| 634 'nacl/nacl_helper_linux.cc', | |
| 635 '../base/posix/unix_domain_socket_linux.cc', | |
| 636 '../components/nacl/loader/nacl_sandbox_linux.cc', | |
| 637 '../content/common/child_process_sandbox_support_impl_shm_linux.cc', | |
| 638 '../content/common/sandbox_init_linux.cc', | |
| 639 '../content/common/sandbox_seccomp_bpf_linux.cc', | |
| 640 '../content/public/common/content_switches.cc', | |
| 641 ], | |
| 642 'conditions': [ | |
| 643 ['toolkit_uses_gtk == 1', { | |
| 644 'dependencies': [ | |
| 645 '../build/linux/system.gyp:gtk', | |
| 646 ], | |
| 647 }], | |
| 648 ['use_glib == 1', { | |
| 649 'dependencies': [ | |
| 650 '../build/linux/system.gyp:glib', | |
| 651 ], | |
| 652 }], | |
| 653 ['os_posix == 1 and OS != "mac"', { | |
| 654 'conditions': [ | |
| 655 ['linux_use_tcmalloc==1', { | |
| 656 'dependencies': [ | |
| 657 '../base/allocator/allocator.gyp:allocator', | |
| 658 ], | |
| 659 }], | |
| 660 ], | |
| 661 }], | |
| 662 ], | |
| 663 'cflags': ['-fPIE'], | |
| 664 'link_settings': { | |
| 665 'ldflags': ['-pie'], | |
| 666 }, | |
| 667 }, | |
| 668 ], | |
| 669 }], | |
| 618 ['test_isolation_mode != "noop"', { | 670 ['test_isolation_mode != "noop"', { |
| 619 'targets': [ | 671 'targets': [ |
| 620 { | 672 { |
| 621 'target_name': 'chrome_run', | 673 'target_name': 'chrome_run', |
| 622 'type': 'none', | 674 'type': 'none', |
| 623 'dependencies': [ | 675 'dependencies': [ |
| 624 'chrome', | 676 'chrome', |
| 625 ], | 677 ], |
| 626 'includes': [ | 678 'includes': [ |
| 627 '../build/isolate.gypi', | 679 '../build/isolate.gypi', |
| 628 'chrome.isolate', | 680 'chrome.isolate', |
| 629 ], | 681 ], |
| 630 'sources': [ | 682 'sources': [ |
| 631 'chrome.isolate', | 683 'chrome.isolate', |
| 632 ], | 684 ], |
| 633 'conditions': [ | 685 'conditions': [ |
| 634 ['OS=="win"', { | 686 ['OS=="win"', { |
| 635 'dependencies': [ | 687 'dependencies': [ |
| 636 'chrome_nacl_win64', | 688 'chrome_nacl_win64', |
| 637 ], | 689 ], |
| 638 }], | 690 }], |
| 639 ], | 691 ], |
| 640 }, | 692 }, |
| 641 ], | 693 ], |
| 642 }], | 694 }], |
| 643 ], | 695 ], |
| 644 } | 696 } |
| OLD | NEW |