diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 23:18:54 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 23:18:54 +0000 |
| commit | 53a1b66f13b6a028c7c905346f413d80dcced45f (patch) | |
| tree | f74b4302b2fe2a9fb336baedab138938a5e03b17 /base | |
| parent | a6d623d7c2e79f0be298e343836126e71c4ed9c5 (diff) | |
| download | chromium_src-53a1b66f13b6a028c7c905346f413d80dcced45f.zip chromium_src-53a1b66f13b6a028c7c905346f413d80dcced45f.tar.gz chromium_src-53a1b66f13b6a028c7c905346f413d80dcced45f.tar.bz2 | |
Fix DIR_SOURCE_ROOT for WebKit checkouts on linux
There's a hardcoded path fixup for base::DIR_SOURCE_ROOT for WebKit-only checkouts that wasn't
updated when the WebKit/chromium directory moved under Source/ a few weeks ago.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6334035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_paths_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/base_paths_linux.cc b/base/base_paths_linux.cc index bdf540c..8b1a0b8 100644 --- a/base/base_paths_linux.cc +++ b/base/base_paths_linux.cc @@ -83,10 +83,10 @@ bool PathProviderPosix(int key, FilePath* result) { } } // In a case of WebKit-only checkout, executable files are put into - // WebKit/out/{Debug|Release}, and we should return WebKit/WebKit/chromium - // for DIR_SOURCE_ROOT. + // <root of checkout>/out/{Debug|Release}, and we should return + // <root of checkout>/Source/WebKit/chromium for DIR_SOURCE_ROOT. if (PathService::Get(base::DIR_EXE, &path)) { - path = path.DirName().DirName().Append("WebKit/chromium"); + path = path.DirName().DirName().Append("Source/WebKit/chromium"); if (file_util::PathExists(path.Append(kThisSourceFile))) { *result = path; return true; |