summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 06:15:21 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 06:15:21 +0000
commitc02581ed5de3df60501f14a1555f8820867548ba (patch)
treeb206a4e301fa0a6e431a8b201fd35aa480100fbd
parent25f7a3522b9457cf63fd1670c2199d0158e75aaa (diff)
downloadchromium_src-c02581ed5de3df60501f14a1555f8820867548ba.zip
chromium_src-c02581ed5de3df60501f14a1555f8820867548ba.tar.gz
chromium_src-c02581ed5de3df60501f14a1555f8820867548ba.tar.bz2
Compile the new sandbox-bpf API code
BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10541040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140971 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--sandbox/sandbox.gyp17
1 files changed, 16 insertions, 1 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index cd564a8..01f50d1 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -144,13 +144,28 @@
'target_name': 'sandbox',
'type': 'none',
'conditions': [
- # Only compile in the seccomp code for the flag combination
+ # Only compile in the seccomp mode 1 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': [
+ '..',
+ ],
+ }],
],
},
],