From 38b1503bd0d90f090744bd0a875a7d6975401aff Mon Sep 17 00:00:00 2001
From: "deanm@chromium.org"
 <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 21 Aug 2009 18:16:20 +0000
Subject: Hide seccomp sandbox from !X86

This CL moves the seccomp sandbox callsite behind an ifdef arch x86 and makes the gyp target conditional on !ARM.

Patch by Joel Stanley <joel@jms.id.au>

BUG=19953

Review URL: http://codereview.chromium.org/173201


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23984 0039d316-1c4b-4281-b951-d872f2087c98
---
 sandbox/sandbox.gyp | 78 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

(limited to 'sandbox')

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"', {
-- 
cgit v1.1