Fix chrome/BUILD.gn.

Building target "chrome:resources" once works, rebuilding it again
fails with this error:

ninja:error: expected depfile 'gen/chrome/resources_grit.d' to mention
'gen/chrome/grit/common_resources.h', got 'gen/chrome/grit/renderer_resources.h'

Making sure the resources targets have unique names fixes this problem.

BUG=None
R=phajdan.jr@chromium.org, zerny@chromium.org

Review URL: https://codereview.chromium.org/466403002

Cr-Commit-Position: refs/heads/master@{#289283}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289283 0039d316-1c4b-4281-b951-d872f2087c98
parent 0af01dd8
...@@ -11,8 +11,8 @@ group("resources") { ...@@ -11,8 +11,8 @@ group("resources") {
# these are just dependencies for the actions themselves, which our actions # these are just dependencies for the actions themselves, which our actions
# list individually when needed. # list individually when needed.
"//chrome/browser:resources", "//chrome/browser:resources",
"//chrome/common:resources", "//chrome/common:common_resources",
"//chrome/renderer:resources", "//chrome/renderer:renderer_resources",
] ]
if (enable_extensions) { if (enable_extensions) {
......
...@@ -12,7 +12,7 @@ gypi_values = exec_script( ...@@ -12,7 +12,7 @@ gypi_values = exec_script(
# GYP version: chrome/chrome_resources.gyp:chrome_resources # GYP version: chrome/chrome_resources.gyp:chrome_resources
# (generate_common_resources action) # (generate_common_resources action)
grit("resources") { grit("common_resources") {
source = "common_resources.grd" source = "common_resources.grd"
output_dir = "$root_gen_dir/chrome" output_dir = "$root_gen_dir/chrome"
outputs = [ outputs = [
......
...@@ -13,7 +13,7 @@ gypi_values = exec_script( ...@@ -13,7 +13,7 @@ gypi_values = exec_script(
# GYP version: chrome/chrome_resources.gyp:chrome_resources # GYP version: chrome/chrome_resources.gyp:chrome_resources
# (generate_renderer_resources action) # (generate_renderer_resources action)
grit("resources") { grit("renderer_resources") {
source = "resources/renderer_resources.grd" source = "resources/renderer_resources.grd"
output_dir = "$root_gen_dir/chrome" output_dir = "$root_gen_dir/chrome"
outputs = [ outputs = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment