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

Unified Diff: sandbox/linux/sandbox_linux.gypi

Issue 1310773006: Update sandbox/linux from upstream (Closed) Base URL: ssh://ssh.github.com/domokit/mojo.git@master
Patch Set: Update to 3909ebfa69566f7374a6900e63cd4d3c73a35378 Created 5 years, 4 months 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
Index: sandbox/linux/sandbox_linux.gypi
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index a7bd259d8a9cc7ee35184104040cfcc63b27f05a..1958258144d0a5ec406389158b5ba341b7fed137 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -137,6 +137,8 @@
'bpf_dsl/cons.h',
'bpf_dsl/dump_bpf.cc',
'bpf_dsl/dump_bpf.h',
+ 'bpf_dsl/errorcode.cc',
+ 'bpf_dsl/errorcode.h',
'bpf_dsl/linux_syscall_ranges.h',
'bpf_dsl/policy.cc',
'bpf_dsl/policy.h',
@@ -151,8 +153,6 @@
'bpf_dsl/verifier.h',
'seccomp-bpf/die.cc',
'seccomp-bpf/die.h',
- 'seccomp-bpf/errorcode.cc',
- 'seccomp-bpf/errorcode.h',
'seccomp-bpf/sandbox_bpf.cc',
'seccomp-bpf/sandbox_bpf.h',
'seccomp-bpf/syscall.cc',
@@ -310,7 +310,8 @@
},
{
# We make this its own target so that it does not interfere
- # with our tests.
+ # with our tests, and so that it may be selectively included
+ # in ports which need it.
'target_name': 'libc_urandom_override',
'type': 'static_library',
'sources': [
« no previous file with comments | « sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc ('k') | sandbox/linux/sandbox_linux_nacl_nonsfi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698