| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "tools/gn/err.h" | 6 #include "tools/gn/err.h" |
| 7 #include "tools/gn/filesystem_utils.h" | 7 #include "tools/gn/filesystem_utils.h" |
| 8 #include "tools/gn/functions.h" | 8 #include "tools/gn/functions.h" |
| 9 #include "tools/gn/input_conversion.h" | 9 #include "tools/gn/input_conversion.h" |
| 10 #include "tools/gn/input_file.h" | 10 #include "tools/gn/input_file.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 g_scheduler->AddGenDependency(file_path); | 61 g_scheduler->AddGenDependency(file_path); |
| 62 | 62 |
| 63 // Read contents. | 63 // Read contents. |
| 64 std::string file_contents; | 64 std::string file_contents; |
| 65 if (!base::ReadFileToString(file_path, &file_contents)) { | 65 if (!base::ReadFileToString(file_path, &file_contents)) { |
| 66 *err = Err(args[0], "Could not read file.", | 66 *err = Err(args[0], "Could not read file.", |
| 67 "I resolved this to \"" + FilePathToUTF8(file_path) + "\"."); | 67 "I resolved this to \"" + FilePathToUTF8(file_path) + "\"."); |
| 68 return Value(); | 68 return Value(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 return ConvertInputToValue(file_contents, function, args[1], err); | 71 return ConvertInputToValue(scope->settings(), file_contents, function, |
| 72 args[1], err); |
| 72 } | 73 } |
| 73 | 74 |
| 74 } // namespace functions | 75 } // namespace functions |
| OLD | NEW |