Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: sandbox/linux/sandbox_linux.gypi

Issue 117803002: Make building seccomp-bpf a GYP condition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Excludes files to be IDE friendly. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | sandbox/linux/sandbox_linux_test_sources.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/sandbox_linux.gypi
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index c20ab0428d539f3b981978766f6f3859f66c5e01..da77077d5ef299fd8c555e362776afcab3b4dcc2 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -12,13 +12,6 @@
'compile_suid_client': 0,
'compile_credentials': 0,
}],
- ['((OS=="linux" or OS=="android") and '
- '(target_arch=="ia32" or target_arch=="x64" or '
- 'target_arch=="arm"))', {
- 'compile_seccomp_bpf': 1,
- }, {
- 'compile_seccomp_bpf': 0,
- }],
['OS=="linux" and (target_arch=="ia32" or target_arch=="x64")', {
'compile_seccomp_bpf_demo': 1,
}, {
@@ -40,8 +33,8 @@
'targets': [
# We have two principal targets: sandbox and sandbox_linux_unittests
# All other targets are listed as dependencies.
- # FIXME(jln): for historial reasons, sandbox_linux is the setuid sandbox
- # and is its own target.
+ # There is one notable exception: for historical reasons, chrome_sandbox is
+ # the setuid sandbox and is its own target.
{
'target_name': 'sandbox',
'type': 'none',
@@ -55,7 +48,7 @@
],
}],
# Compile seccomp BPF when we support it.
- [ 'compile_seccomp_bpf==1', {
+ [ 'use_seccomp_bpf==1', {
'dependencies': [
'seccomp_bpf',
'seccomp_bpf_helpers',
« no previous file with comments | « content/content_common.gypi ('k') | sandbox/linux/sandbox_linux_test_sources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698