sandbox/linux/sandbox_linux.gypi - Issue 935333002: Update from https://crrev.com/316786

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sandbox/linux/sandbox_linux.gypi

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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

« no previous file with comments | « sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc ('k') | sandbox/linux/sandbox_linux_test_sources.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sandbox/linux/sandbox_linux.gypi

diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi

index c03b024ee8a3f4e0d606b0cfc94ef3cf856fd840..a623971b605c166a6c97e9fa92c058f529950efd 100644

--- a/sandbox/linux/sandbox_linux.gypi

+++ b/sandbox/linux/sandbox_linux.gypi

@@ -127,10 +127,13 @@

'bpf_dsl/cons.h',

'bpf_dsl/dump_bpf.cc',

'bpf_dsl/dump_bpf.h',

+ 'bpf_dsl/linux_syscall_ranges.h',

'bpf_dsl/policy.cc',

'bpf_dsl/policy.h',

'bpf_dsl/policy_compiler.cc',

'bpf_dsl/policy_compiler.h',

+ 'bpf_dsl/seccomp_macros.h',

'bpf_dsl/syscall_set.cc',

'bpf_dsl/syscall_set.h',

'bpf_dsl/trap_registry.h',

@@ -138,7 +141,6 @@

'seccomp-bpf/die.h',

'seccomp-bpf/errorcode.cc',

'seccomp-bpf/errorcode.h',

- 'seccomp-bpf/linux_seccomp.h',

'seccomp-bpf/sandbox_bpf.cc',

'seccomp-bpf/sandbox_bpf.h',

'seccomp-bpf/syscall.cc',

@@ -221,6 +223,10 @@

'sources': [

'services/init_process_reaper.cc',

'services/init_process_reaper.h',

+ 'services/proc_util.cc',

+ 'services/proc_util.h',

+ 'services/resource_limits.cc',

+ 'services/resource_limits.h',

'services/scoped_process.cc',

'services/scoped_process.h',

'services/syscall_wrappers.cc',

@@ -258,8 +264,6 @@

'services/namespace_sandbox.h',

'services/namespace_utils.cc',

'services/namespace_utils.h',

- 'services/proc_util.cc',

- 'services/proc_util.h',

'dependencies': [

# for capabilities.cc.

@@ -274,18 +278,19 @@

{ 'target_name': 'sandbox_services_headers',

'type': 'none',

'sources': [

- 'services/android_arm_ucontext.h',

- 'services/android_arm64_ucontext.h',

- 'services/android_futex.h',

- 'services/android_ucontext.h',

- 'services/android_i386_ucontext.h',

- 'services/android_mips_ucontext.h',

- 'services/arm_linux_syscalls.h',

- 'services/arm64_linux_syscalls.h',

- 'services/mips_linux_syscalls.h',

- 'services/linux_syscalls.h',

- 'services/x86_32_linux_syscalls.h',

- 'services/x86_64_linux_syscalls.h',

+ 'system_headers/android_arm64_ucontext.h',

+ 'system_headers/android_arm_ucontext.h',

+ 'system_headers/android_futex.h',

+ 'system_headers/android_i386_ucontext.h',

+ 'system_headers/android_mips_ucontext.h',

+ 'system_headers/android_ucontext.h',

+ 'system_headers/arm64_linux_syscalls.h',

+ 'system_headers/arm_linux_syscalls.h',

+ 'system_headers/linux_seccomp.h',

+ 'system_headers/linux_syscalls.h',

+ 'system_headers/mips_linux_syscalls.h',

+ 'system_headers/x86_32_linux_syscalls.h',

+ 'system_headers/x86_64_linux_syscalls.h',

'include_dirs': [

'..',