diff options
| author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 04:48:40 +0000 |
|---|---|---|
| committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 04:48:40 +0000 |
| commit | ae1e1285ee79cbfdf2ff94d7b56c1a973620a37b (patch) | |
| tree | 9c054658f276e9c72d310536a7b7738bf78b0948 /chrome | |
| parent | 112bbd6e31565d4bc569093fd9687b7ac52f2ccf (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/app/DEPS | 2 | ||||
| -rw-r--r-- | chrome/app/breakpad_linux.cc | 2 | ||||
| -rw-r--r-- | chrome/nacl/DEPS | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_linux.cc | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/DEPS b/chrome/app/DEPS index e8880a2..31f4011 100644 --- a/chrome/app/DEPS +++ b/chrome/app/DEPS @@ -12,7 +12,7 @@ include_rules = [ "+media/base", # For initializing media library. "+policy", # For generated headers and source "+sandbox", - "+seccompsandbox", + "+sandbox/linux/seccomp-legacy", "+tools/memory_watcher", "+third_party/lss/linux_syscall_support.h", ] diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 2bf3e81..d363f4d 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -51,7 +51,7 @@ #include "base/android/path_utils.h" #include "third_party/lss/linux_syscall_support.h" #else -#include "seccompsandbox/linux_syscall_support.h" +#include "sandbox/linux/seccomp-legacy/linux_syscall_support.h" #endif #if defined(OS_ANDROID) 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) |