| Index: tools/gn/functions.cc
|
| diff --git a/tools/gn/functions.cc b/tools/gn/functions.cc
|
| index b7e133550b8e5b4a0ff50b4a3e31947a53846b8d..c99075ae25cdaef82c5d704e0c72e6d28d90a688 100644
|
| --- a/tools/gn/functions.cc
|
| +++ b/tools/gn/functions.cc
|
| @@ -491,10 +491,12 @@ Value RunImport(Scope* scope,
|
|
|
| const SourceDir& input_dir = scope->GetSourceDir();
|
| SourceFile import_file =
|
| - input_dir.ResolveRelativeFile(args[0].string_value(),
|
| + input_dir.ResolveRelativeFile(args[0], err,
|
| scope->settings()->build_settings()->root_path_utf8());
|
| - scope->settings()->import_manager().DoImport(import_file, function,
|
| - scope, err);
|
| + if (!err->has_error()) {
|
| + scope->settings()->import_manager().DoImport(import_file, function,
|
| + scope, err);
|
| + }
|
| return Value();
|
| }
|
|
|
|
|