From ea3c26f8a0d5d86c493929eb09ba070ce3c37c55 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Thu, 7 Jun 2012 06:41:24 +0000 Subject: Revert 140971 - Broke compile on CrOS Daisy bot Compile the new sandbox-bpf API code BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10541040 TBR=jln@chromium.org Review URL: https://chromiumcodereview.appspot.com/10541048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140973 0039d316-1c4b-4281-b951-d872f2087c98 --- sandbox/sandbox.gyp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'sandbox/sandbox.gyp') diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp index 01f50d1..cd564a8 100644 --- a/sandbox/sandbox.gyp +++ b/sandbox/sandbox.gyp @@ -144,28 +144,13 @@ 'target_name': 'sandbox', 'type': 'none', 'conditions': [ - # Only compile in the seccomp mode 1 code for the flag combination + # Only compile in the seccomp code for the flag combination # where we support it. [ 'OS=="linux" and target_arch!="arm" and toolkit_views==0 and selinux==0', { 'dependencies': [ '../seccompsandbox/seccomp.gyp:seccomp_sandbox', ], }], - # This does not include Android. - [ 'OS=="linux"', { - 'type': 'static_library', - # Always compile seccomp mode 2 code on Linux - 'sources': [ - 'linux/seccomp-bpf/sandbox_bpf.cc', - 'linux/seccomp-bpf/sandbox_bpf.h', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - }], ], }, ], -- cgit v1.1