Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: tools/gn/action_target_generator.cc

Issue 1155713006: GN: Make file/dir resolving return errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/gn/command_format.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3cd4e4756fb038a5ad1d941da9b149c93a7320f2 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 (err_->has_error())
return false;
- }
target_->action_values().set_script(script_file);
return true;
}
« no previous file with comments | « no previous file | tools/gn/command_format.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698