diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:19:34 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:19:34 +0000 |
| commit | 398841d7b307c88957f6cb5af38f557d942adbf8 (patch) | |
| tree | 48947dd690f934a8c479c7b8ed5ce24a2fb9868b /o3d/utils/cross | |
| parent | fa89702052f10d610859e2d724a7262743fe7418 (diff) | |
| download | chromium_src-398841d7b307c88957f6cb5af38f557d942adbf8.zip chromium_src-398841d7b307c88957f6cb5af38f557d942adbf8.tar.gz chromium_src-398841d7b307c88957f6cb5af38f557d942adbf8.tar.bz2 | |
Fixing several problems with the build.
- Had to make one line file_path_utils conditional on which build
system was building it (because GYP build and scons build use
different versions of chrome/base).
- Missed a couple instances of "file/" in the path to nixysa.
- New version of breakpad has a different API on the Mac.
Review URL: http://codereview.chromium.org/160056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/utils/cross')
| -rw-r--r-- | o3d/utils/cross/file_path_utils.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/utils/cross/file_path_utils.cc b/o3d/utils/cross/file_path_utils.cc index bea30de..d62c417 100644 --- a/o3d/utils/cross/file_path_utils.cc +++ b/o3d/utils/cross/file_path_utils.cc @@ -173,7 +173,11 @@ bool FindFileHelper(const FilePath& path_to_search, const FilePath& path_to_find, FilePath* found_path) { std::vector<FilePath::StringType> parts; +#ifdef GYP_BUILD path_to_find.GetComponents(&parts); +#else + file_util::PathComponents(path_to_find, &parts); +#endif for (size_t ii = 0; ii < parts.size(); ++ii) { // build a path from parts. |