Index: sandbox/linux/BUILD.gn |
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn |
index 3070b7347bcc115bb1fc145d2162d9db366a6618..1e6d7a1c813296ff9e7d35ffb60340407a54cec7 100644 |
--- a/sandbox/linux/BUILD.gn |
+++ b/sandbox/linux/BUILD.gn |
@@ -41,10 +41,7 @@ group("sandbox") { |
public_deps += [ ":suid_sandbox_client" ] |
} |
if (use_seccomp_bpf || is_nacl_nonsfi) { |
- public_deps += [ |
- ":seccomp_bpf", |
- ":seccomp_bpf_helpers", |
- ] |
+ public_deps += [ ":seccomp_bpf" ] |
} |
} |
@@ -221,6 +218,14 @@ component("seccomp_bpf") { |
"bpf_dsl/syscall_set.cc", |
"bpf_dsl/syscall_set.h", |
"bpf_dsl/trap_registry.h", |
+ "seccomp-bpf-helpers/baseline_policy.cc", |
+ "seccomp-bpf-helpers/baseline_policy.h", |
+ "seccomp-bpf-helpers/sigsys_handlers.cc", |
+ "seccomp-bpf-helpers/sigsys_handlers.h", |
+ "seccomp-bpf-helpers/syscall_parameters_restrictions.cc", |
+ "seccomp-bpf-helpers/syscall_parameters_restrictions.h", |
+ "seccomp-bpf-helpers/syscall_sets.cc", |
+ "seccomp-bpf-helpers/syscall_sets.h", |
"seccomp-bpf/die.cc", |
"seccomp-bpf/die.h", |
"seccomp-bpf/sandbox_bpf.cc", |
@@ -250,31 +255,6 @@ component("seccomp_bpf") { |
"bpf_dsl/linux_syscall_ranges.h", |
"bpf_dsl/seccomp_macros.h", |
"bpf_dsl/trap_registry.h", |
- ] |
- } |
-} |
- |
-component("seccomp_bpf_helpers") { |
- sources = [ |
- "seccomp-bpf-helpers/baseline_policy.cc", |
- "seccomp-bpf-helpers/baseline_policy.h", |
- "seccomp-bpf-helpers/sigsys_handlers.cc", |
- "seccomp-bpf-helpers/sigsys_handlers.h", |
- "seccomp-bpf-helpers/syscall_parameters_restrictions.cc", |
- "seccomp-bpf-helpers/syscall_parameters_restrictions.h", |
- "seccomp-bpf-helpers/syscall_sets.cc", |
- "seccomp-bpf-helpers/syscall_sets.h", |
- ] |
- defines = [ "SANDBOX_IMPLEMENTATION" ] |
- |
- deps = [ |
- ":sandbox_services", |
- ":seccomp_bpf", |
- "//base", |
- ] |
- |
- if (is_nacl_nonsfi) { |
- sources -= [ |
"seccomp-bpf-helpers/baseline_policy.cc", |
"seccomp-bpf-helpers/baseline_policy.h", |
"seccomp-bpf-helpers/syscall_sets.cc", |