summaryrefslogtreecommitdiffstats
path: root/sandbox/sandbox.gyp
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 16:22:01 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 16:22:01 +0000
commit808ea578e1597271a1a73de640e9957babb4f9ea (patch)
tree119f7e82f154f61f1cfee5504063223dd41a211d /sandbox/sandbox.gyp
parent4253e8240d8c71588abebcc123d4e224c8a6a83a (diff)
downloadchromium_src-808ea578e1597271a1a73de640e9957babb4f9ea.zip
chromium_src-808ea578e1597271a1a73de640e9957babb4f9ea.tar.gz
chromium_src-808ea578e1597271a1a73de640e9957babb4f9ea.tar.bz2
Pull seccomp-sandbox in via DEPS rather than using an in-tree copy
This means changes to the sandbox won't have to be committed twice, to both trees. This is a retry of r57921, which was committed with git-svn and failed to remove the "seccomp" directory. This caused problems when trying to "svn checkout" to the same location, and the change was reverted. This time I will use SVN to commit the change. BUG=none TEST=smoke test of running chromium with --enable-seccomp-sandbox Review URL: http://codereview.chromium.org/3225010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/sandbox.gyp')
-rw-r--r--sandbox/sandbox.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 706cba2..1150261 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -161,7 +161,7 @@
'conditions': [
['target_arch!="arm"', {
'dependencies': [
- 'linux/seccomp/seccomp.gyp:seccomp_sandbox',
+ '../seccompsandbox/seccomp.gyp:seccomp_sandbox',
]},
],
],