summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 04:48:40 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 04:48:40 +0000
commitae1e1285ee79cbfdf2ff94d7b56c1a973620a37b (patch)
tree9c054658f276e9c72d310536a7b7738bf78b0948 /chrome/nacl
parent112bbd6e31565d4bc569093fd9687b7ac52f2ccf (diff)
downloadchromium_src-ae1e1285ee79cbfdf2ff94d7b56c1a973620a37b.zip
chromium_src-ae1e1285ee79cbfdf2ff94d7b56c1a973620a37b.tar.gz
chromium_src-ae1e1285ee79cbfdf2ff94d7b56c1a973620a37b.tar.bz2
Move /seccompsandbox to /sandbox/linux/seccomp-legacy
BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10792027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/DEPS2
-rw-r--r--chrome/nacl/nacl_main_platform_delegate_linux.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS
index cba9654..7f53c3d 100644
--- a/chrome/nacl/DEPS
+++ b/chrome/nacl/DEPS
@@ -2,7 +2,7 @@ include_rules = [
"+chrome/app/breakpad_win.h",
"+content/public/app/startup_helper_win.h",
"+sandbox/linux/services",
+ "+sandbox/linux/seccomp-legacy",
"+sandbox/win/src",
- "+seccompsandbox",
"+native_client/src",
]
diff --git a/chrome/nacl/nacl_main_platform_delegate_linux.cc b/chrome/nacl/nacl_main_platform_delegate_linux.cc
index 2941c55..d63a6c2 100644
--- a/chrome/nacl/nacl_main_platform_delegate_linux.cc
+++ b/chrome/nacl/nacl_main_platform_delegate_linux.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/nacl/nacl_main_platform_delegate.h"
#include "base/command_line.h"
-#include "seccompsandbox/sandbox.h"
+#include "sandbox/linux/seccomp-legacy/sandbox.h"
NaClMainPlatformDelegate::NaClMainPlatformDelegate(
const content::MainFunctionParams& parameters)