| Index: tools/gn/secondary/tools/grit/grit_rule.gni
|
| diff --git a/tools/gn/secondary/tools/grit/grit_rule.gni b/tools/gn/secondary/tools/grit/grit_rule.gni
|
| index 735a4da9fecfa04be8030d1df11034d78c94bbb6..06cee4a637d6c3ec96add7ec9d2ef2469c0fc974 100644
|
| --- a/tools/gn/secondary/tools/grit/grit_rule.gni
|
| +++ b/tools/gn/secondary/tools/grit/grit_rule.gni
|
| @@ -24,9 +24,9 @@ template("grit") {
|
| # These are all passed as arguments to the script so have to be relative to
|
| # the build directory.
|
| resource_ids =
|
| - rebase_path("//tools/gritsettings/resource_ids", ".", root_build_dir)
|
| - output_dir = rebase_path(target_gen_dir, ".", root_build_dir)
|
| - source_path = rebase_path(source, ".", root_build_dir)
|
| + rebase_path("//tools/gritsettings/resource_ids", root_build_dir)
|
| + output_dir = rebase_path(target_gen_dir, root_build_dir)
|
| + source_path = rebase_path(source, root_build_dir)
|
|
|
| if (!defined(grit_flags)) {
|
| grit_flags = [] # These are optional so default to empty list.
|
| @@ -36,7 +36,7 @@ template("grit") {
|
| [ "--inputs", source_path, "-f", resource_ids] + grit_flags, "list lines")
|
| # The inputs are relative to the current (build) directory, rebase to
|
| # the current one.
|
| - grit_inputs = rebase_path(grit_inputs_build_rel, root_build_dir, ".")
|
| + grit_inputs = rebase_path(grit_inputs_build_rel, root_build_dir)
|
|
|
| grit_outputs_build_rel = exec_script(grit_info_script,
|
| [ "--outputs", "$output_dir", source_path, "-f", resource_ids ] +
|
| @@ -44,7 +44,7 @@ template("grit") {
|
| "list lines")
|
| # The inputs are relative to the current (build) directory, rebase to
|
| # the current one.
|
| - grit_outputs = rebase_path(grit_outputs_build_rel, root_build_dir, ".")
|
| + grit_outputs = rebase_path(grit_outputs_build_rel, root_build_dir)
|
|
|
| # The current grit setup makes an file in $target_gen_dir/grit/foo.h that
|
| # the source code expects to include via "grit/foo.h". It would be nice to
|
|
|