diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:41:24 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:41:24 +0000 |
| commit | ea3c26f8a0d5d86c493929eb09ba070ce3c37c55 (patch) | |
| tree | b772660a596f7ab5ca72a563fc48cb9eb14925f6 /sandbox/sandbox.gyp | |
| parent | 735dce06ed30b61b49de10642f45566ec612a5d5 (diff) | |
| download | chromium_src-ea3c26f8a0d5d86c493929eb09ba070ce3c37c55.zip chromium_src-ea3c26f8a0d5d86c493929eb09ba070ce3c37c55.tar.gz chromium_src-ea3c26f8a0d5d86c493929eb09ba070ce3c37c55.tar.bz2 | |
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
Diffstat (limited to 'sandbox/sandbox.gyp')
| -rw-r--r-- | sandbox/sandbox.gyp | 17 |
1 files changed, 1 insertions, 16 deletions
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': [ - '..', - ], - }], ], }, ], |