Chromium Code Reviews| Index: tools/gn/action_target_generator.cc |
| diff --git a/tools/gn/action_target_generator.cc b/tools/gn/action_target_generator.cc |
| index a1ab3a34d4c5ce26bf1efba657aec538c62fdd55..3cf7bd2e69b4876f3b989a334538ff02d5ebd6c4 100644 |
| --- a/tools/gn/action_target_generator.cc |
| +++ b/tools/gn/action_target_generator.cc |
| @@ -76,12 +76,11 @@ bool ActionTargetGenerator::FillScript() { |
| return false; |
| SourceFile script_file = |
| - scope_->GetSourceDir().ResolveRelativeFile(value->string_value(), |
| + scope_->GetSourceDir().ResolveRelativeFile( |
| + *value, err_, |
| scope_->settings()->build_settings()->root_path_utf8()); |
| - if (script_file.value().empty()) { |
| - *err_ = Err(*value, "script name is empty"); |
| + if (script_file.value().empty()) |
|
scottmg
2015/06/03 21:01:58
should this be err_.has_error()?
|
| return false; |
| - } |
| target_->action_values().set_script(script_file); |
| return true; |
| } |