diff options
| author | alexis.menard@intel.com <alexis.menard@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 02:19:19 +0000 |
|---|---|---|
| committer | alexis.menard@intel.com <alexis.menard@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 02:19:19 +0000 |
| commit | c329d1dcc232f8aa0ad1fced2f961cb6cba1acc6 (patch) | |
| tree | 95a96c5c74c71679436aeb3eeb1bdf77312616c7 /components/nacl.gyp | |
| parent | 299e0328e8fd2233c456b3c9097c12d767a8e5e2 (diff) | |
| download | chromium_src-c329d1dcc232f8aa0ad1fced2f961cb6cba1acc6.zip chromium_src-c329d1dcc232f8aa0ad1fced2f961cb6cba1acc6.tar.gz chromium_src-c329d1dcc232f8aa0ad1fced2f961cb6cba1acc6.tar.bz2 | |
Move nacl_helper_linux.cc to components/nacl
Move the NaCl linux helper into the components/nacl/loader directory as well
as the build target to components/nacl.gyp. This patch also
removed chrome/nacl.gypi which is not needed anymore.
This is part of an effort to componentize NaCl code.
Patch by mrunal.kapade@intel.com with modifications by myself.
BUG=244791
Review URL: https://codereview.chromium.org/58333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/nacl.gyp')
| -rw-r--r-- | components/nacl.gyp | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/components/nacl.gyp b/components/nacl.gyp index 3c0b26f..f841b7b 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -116,6 +116,62 @@ }, ], 'conditions': [ + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'nacl_helper', + 'type': 'executable', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + 'nacl', + 'nacl_common.gyp:nacl_common', + '../crypto/crypto.gyp:crypto', + '../sandbox/sandbox.gyp:libc_urandom_override', + '../sandbox/sandbox.gyp:sandbox', + ], + 'defines': [ + '<@(nacl_defines)', + ], + 'sources': [ + 'nacl/loader/nacl_sandbox_linux.cc', + 'nacl/loader/nacl_helper_linux.cc', + 'nacl/loader/nacl_helper_linux.h', + '../base/posix/unix_domain_socket_linux.cc', + '../content/common/child_process_sandbox_support_impl_shm_linux.cc', + '../content/common/sandbox_init_linux.cc', + '../content/common/sandbox_seccomp_bpf_linux.cc', + '../content/public/common/content_switches.cc', + ], + 'conditions': [ + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], + ['use_glib == 1', { + 'dependencies': [ + '../build/linux/system.gyp:glib', + ], + }], + ['os_posix == 1 and OS != "mac"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], + ], + 'cflags': ['-fPIE'], + 'link_settings': { + 'ldflags': ['-pie'], + }, + }, + ], + }], ['OS=="win" and target_arch=="ia32"', { 'targets': [ { |