diff options
| -rw-r--r-- | chrome/renderer/renderer_main_platform_delegate_linux.cc | 2 | ||||
| -rw-r--r-- | sandbox/sandbox.gyp | 78 |
2 files changed, 43 insertions, 37 deletions
diff --git a/chrome/renderer/renderer_main_platform_delegate_linux.cc b/chrome/renderer/renderer_main_platform_delegate_linux.cc index 5e8555d..d93f1a5 100644 --- a/chrome/renderer/renderer_main_platform_delegate_linux.cc +++ b/chrome/renderer/renderer_main_platform_delegate_linux.cc @@ -36,10 +36,12 @@ bool RendererMainPlatformDelegate::EnableSandbox() { // // The seccomp sandbox is started in the renderer. // http://code.google.com/p/seccompsandbox/ +#if defined(ARCH_CPU_X86_FAMILY) if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableSeccompSandbox)) { StartSeccompSandbox(); } +#endif return true; } diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp index 72b3af3..987dbea 100644 --- a/sandbox/sandbox.gyp +++ b/sandbox/sandbox.gyp @@ -35,44 +35,48 @@ 'dependencies': [ '../base/base.gyp:base', ], - 'sources': [ - 'linux/seccomp/access.cc', - 'linux/seccomp/clone.cc', - 'linux/seccomp/exit.cc', - 'linux/seccomp/debug.cc', - 'linux/seccomp/getpid.cc', - 'linux/seccomp/gettid.cc', - 'linux/seccomp/ioctl.cc', - 'linux/seccomp/ipc.cc', - 'linux/seccomp/library.cc', - 'linux/seccomp/library.h', - 'linux/seccomp/linux_syscall_support.h', - 'linux/seccomp/madvise.cc', - 'linux/seccomp/maps.cc', - 'linux/seccomp/maps.h', - 'linux/seccomp/mmap.cc', - 'linux/seccomp/mprotect.cc', - 'linux/seccomp/munmap.cc', - 'linux/seccomp/mutex.h', - 'linux/seccomp/open.cc', - 'linux/seccomp/sandbox.cc', - 'linux/seccomp/sandbox.h', - 'linux/seccomp/sandbox_impl.h', - 'linux/seccomp/securemem.cc', - 'linux/seccomp/securemem.h', - 'linux/seccomp/socketcall.cc', - 'linux/seccomp/stat.cc', - 'linux/seccomp/syscall.cc', - 'linux/seccomp/syscall.h', - 'linux/seccomp/syscall_table.c', - 'linux/seccomp/syscall_table.h', - 'linux/seccomp/tls.h', - 'linux/seccomp/trusted_process.cc', - 'linux/seccomp/trusted_thread.cc', - 'linux/seccomp/x86_decode.cc', - 'linux/seccomp/x86_decode.h', + 'conditions': [ + ['target_arch!="arm"', { + 'sources': [ + 'linux/seccomp/access.cc', + 'linux/seccomp/clone.cc', + 'linux/seccomp/exit.cc', + 'linux/seccomp/debug.cc', + 'linux/seccomp/getpid.cc', + 'linux/seccomp/gettid.cc', + 'linux/seccomp/ioctl.cc', + 'linux/seccomp/ipc.cc', + 'linux/seccomp/library.cc', + 'linux/seccomp/library.h', + 'linux/seccomp/linux_syscall_support.h', + 'linux/seccomp/madvise.cc', + 'linux/seccomp/maps.cc', + 'linux/seccomp/maps.h', + 'linux/seccomp/mmap.cc', + 'linux/seccomp/mprotect.cc', + 'linux/seccomp/munmap.cc', + 'linux/seccomp/mutex.h', + 'linux/seccomp/open.cc', + 'linux/seccomp/sandbox.cc', + 'linux/seccomp/sandbox.h', + 'linux/seccomp/sandbox_impl.h', + 'linux/seccomp/securemem.cc', + 'linux/seccomp/securemem.h', + 'linux/seccomp/socketcall.cc', + 'linux/seccomp/stat.cc', + 'linux/seccomp/syscall.cc', + 'linux/seccomp/syscall.h', + 'linux/seccomp/syscall_table.c', + 'linux/seccomp/syscall_table.h', + 'linux/seccomp/tls.h', + 'linux/seccomp/trusted_process.cc', + 'linux/seccomp/trusted_thread.cc', + 'linux/seccomp/x86_decode.cc', + 'linux/seccomp/x86_decode.h', + ], + }, ], - }, + ]}, ], }], [ 'OS=="win"', { |