| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "tools/gn/source_file.h" | 5 #include "tools/gn/source_file.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "tools/gn/filesystem_utils.h" | 9 #include "tools/gn/filesystem_utils.h" |
| 10 #include "tools/gn/source_dir.h" | 10 #include "tools/gn/source_dir.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return base::FilePath(); | 46 return base::FilePath(); |
| 47 | 47 |
| 48 std::string converted; | 48 std::string converted; |
| 49 if (is_system_absolute()) { | 49 if (is_system_absolute()) { |
| 50 if (value_.size() > 2 && value_[2] == ':') { | 50 if (value_.size() > 2 && value_[2] == ':') { |
| 51 // Windows path, strip the leading slash. | 51 // Windows path, strip the leading slash. |
| 52 converted.assign(&value_[1], value_.size() - 1); | 52 converted.assign(&value_[1], value_.size() - 1); |
| 53 } else { | 53 } else { |
| 54 converted.assign(value_); | 54 converted.assign(value_); |
| 55 } | 55 } |
| 56 ConvertPathToSystem(&converted); | |
| 57 return base::FilePath(UTF8ToFilePath(converted)); | 56 return base::FilePath(UTF8ToFilePath(converted)); |
| 58 } | 57 } |
| 59 | 58 |
| 60 converted.assign(&value_[2], value_.size() - 2); | 59 converted.assign(&value_[2], value_.size() - 2); |
| 61 ConvertPathToSystem(&converted); | 60 return source_root.Append(UTF8ToFilePath(converted)) |
| 62 return source_root.Append(UTF8ToFilePath(converted)); | 61 .NormalizePathSeparatorsTo('/'); |
| 63 } | 62 } |
| OLD | NEW |