Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chrome/chrome_exe.gypi

Issue 21020004: Move nacl.gypi to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/nacl.gypi » ('j') | components/nacl.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 75adb4e7f9466dfd82b511be810d7bbd55660fc1..7236141d794d21858b548eadeb7416a8e65fe966 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -615,6 +615,58 @@
}],
],
}],
+ ['OS=="linux"', {
+ 'targets': [
+ {
+ '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
+ 'type': 'executable',
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ 'nacl',
+ '../components/nacl_common.gyp:nacl_common',
+ '../crypto/crypto.gyp:crypto',
+ '../sandbox/sandbox.gyp:libc_urandom_override',
+ '../sandbox/sandbox.gyp:sandbox',
+ ],
+ 'sources': [
+ 'nacl/nacl_helper_linux.cc',
+ '../base/posix/unix_domain_socket_linux.cc',
+ '../components/nacl/loader/nacl_sandbox_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'],
+ },
+ },
+ ],
+ }],
['test_isolation_mode != "noop"', {
'targets': [
{
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/nacl.gypi » ('j') | components/nacl.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698