| Index: content/browser/devtools/BUILD.gn
|
| diff --git a/content/browser/devtools/BUILD.gn b/content/browser/devtools/BUILD.gn
|
| index ffeb2491809cf04f3b7026b02cdfb6042a87968c..c24b60e2686cd6467cd4cabf0cc3a335633fe5f4 100644
|
| --- a/content/browser/devtools/BUILD.gn
|
| +++ b/content/browser/devtools/BUILD.gn
|
| @@ -13,36 +13,20 @@ group("resources") {
|
| }
|
|
|
| # In GYP: devtools_resources action in the devtools_resources target.
|
| -action("devtools_resources") {
|
| - visibility = ":resources"
|
| -
|
| - # This can't use grit_rule.gni because the grd file is generated at build
|
| - # time, so the trick of using grit_info to get the real inputs/outputs at GYP
|
| - # time isn't possible.
|
| - script = "//tools/grit/grit.py"
|
| -
|
| - grdfile = "$root_gen_dir/devtools/devtools_resources.grd"
|
| +grit("devtools_resources") {
|
| + source = "$root_gen_dir/devtools/devtools_resources.grd"
|
|
|
| - inputs = [ grdfile ] +
|
| - rebase_path(exec_script("//tools/grit/grit_info.py", [ "--inputs" ],
|
| - "list lines"),
|
| - ".", "//")
|
| -
|
| - out_dir = "$root_gen_dir/webkit"
|
| + output_dir = "$root_gen_dir/webkit"
|
| outputs = [
|
| - "$out_dir/grit/devtools_resources.h",
|
| - "$out_dir/devtools_resources.pak",
|
| - "$out_dir/grit/devtools_resources_map.cc",
|
| - "$out_dir/grit/devtools_resources_map.h",
|
| + "grit/devtools_resources.h",
|
| + "devtools_resources.pak",
|
| + "grit/devtools_resources_map.cc",
|
| + "grit/devtools_resources_map.h",
|
| ]
|
|
|
| - args = [
|
| - "-i", rebase_path(grdfile, root_build_dir), "build",
|
| - "-f", rebase_path("//tools/gritsettings/resource_ids", root_build_dir),
|
| - "-o", rebase_path(out_dir, root_build_dir),
|
| - "-D", "SHARED_INTERMEDIATE_DIR=" +
|
| - rebase_path(root_gen_dir, root_build_dir),
|
| - ] + grit_defines
|
| + defines = [
|
| + "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir),
|
| + ]
|
|
|
| deps = [
|
| # This is the action that generates out .grd input file.
|
|
|