sandbox/linux/sandbox_linux.gypi - Issue 1180693002: Update from https://crrev.com/333737

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 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased Created 5 years, 6 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/namespace_unix_domain_socket_unittest.cc ('k') | sandbox/linux/sandbox_linux_nacl_nonsfi.gyp » ('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 77242235f8e3c19660723098fd9d20ce6b49cf97..a7bd259d8a9cc7ee35184104040cfcc63b27f05a 100644

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

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

@@ -8,9 +8,11 @@

['OS=="linux"', {

'compile_suid_client': 1,

'compile_credentials': 1,

+ 'use_base_test_suite': 1,

}, {

'compile_suid_client': 0,

'compile_credentials': 0,

+ 'use_base_test_suite': 0,

}],

['OS=="linux" and (target_arch=="ia32" or target_arch=="x64" or '

'target_arch=="mipsel")', {

@@ -88,6 +90,14 @@

'seccomp_bpf',

]

}],

+ [ 'use_base_test_suite==1', {

+ 'dependencies': [

+ '../base/base.gyp:test_support_base',

+ ],

+ 'defines': [

+ 'SANDBOX_USES_BASE_TEST_SUITE',

+ ],

+ }],

{

@@ -287,6 +297,7 @@

'system_headers/linux_futex.h',

'system_headers/linux_seccomp.h',

'system_headers/linux_syscalls.h',

+ 'system_headers/linux_time.h',

'system_headers/linux_ucontext.h',

'system_headers/mips_linux_syscalls.h',

'system_headers/mips_linux_ucontext.h',