diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 15:04:14 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 15:04:14 +0000 |
| commit | dc3f20a478bb50a5a5c7e7d584115a46b1468aeb (patch) | |
| tree | 6af9d7d96d89a5b3d39c3ae5c4a030194a4074ef /base/base_paths_posix.cc | |
| parent | fe8d9364441315dfdc49d7a0b9dfd7dc5f15795c (diff) | |
| download | chromium_src-dc3f20a478bb50a5a5c7e7d584115a46b1468aeb.zip chromium_src-dc3f20a478bb50a5a5c7e7d584115a46b1468aeb.tar.gz chromium_src-dc3f20a478bb50a5a5c7e7d584115a46b1468aeb.tar.bz2 | |
Remove the linux-only CR_SOURCE_ROOT environment variable override of base::DIR_SOURCE_ROOT.
The environment variable overidde was only implemented on linux and not on the
other OSes. So it was not coherent across platforms. I searched for usage and
didn't find anything compelling. If this change causes any breakage, simply
revert it. If is is needed, it should be made coherent between platforms.
Note that this trick is not compatible with test isolation, where test should
find their data file at deterministic relative location, hence the removal of
this override.
R=willchan@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10661019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_paths_posix.cc')
| -rw-r--r-- | base/base_paths_posix.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc index a1c45a0..d8d5ae6 100644 --- a/base/base_paths_posix.cc +++ b/base/base_paths_posix.cc @@ -74,20 +74,6 @@ bool PathProviderPosix(int key, FilePath* result) { #endif } case base::DIR_SOURCE_ROOT: { - // Allow passing this in the environment, for more flexibility in build - // tree configurations (sub-project builds, gyp --output_dir, etc.) - scoped_ptr<base::Environment> env(base::Environment::Create()); - std::string cr_source_root; - if (env->GetVar("CR_SOURCE_ROOT", &cr_source_root)) { - path = FilePath(cr_source_root); - if (file_util::PathExists(path)) { - *result = path; - return true; - } else { - DLOG(WARNING) << "CR_SOURCE_ROOT is set, but it appears to not " - << "point to a directory."; - } - } // On POSIX, unit tests execute two levels deep from the source root. // For example: out/{Debug|Release}/net_unittest if (PathService::Get(base::DIR_EXE, &path)) { |
