GN: Specify grit generated output paths to be the same as gyp's.

BUG=401588

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

Cr-Commit-Position: refs/heads/master@{#289149}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289149 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 11 insertions, 3 deletions

diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 80becce..b226380 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -8,6 +8,7 @@ import("//tools/grit/grit_rule.gni")
 #              (generate_generated_resources action)
 grit("generated_resources") {
   source = "generated_resources.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/generated_resources.h",
     "generated_resources_am.pak",
@@ -74,8 +75,8 @@ action("make_generated_resources_map") {
 
   script = "//chrome/browser/metrics/variations/generate_resources_map.py"
 
-  inputs = [ "$target_gen_dir/grit/generated_resources.h" ]
-  outputs = [ "$target_gen_dir/generated_resources_map.cc" ]
+  inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
+  outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
 
   args = rebase_path(inputs, root_build_dir) +
       rebase_path(outputs, root_build_dir)
@@ -94,6 +95,7 @@ source_set("generated_resources_map") {
 #              (generate_google_chrome_strings action)
 grit("google_chrome_strings") {
   source = "google_chrome_strings.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/google_chrome_strings.h",
     "google_chrome_strings_am.pak",
@@ -157,6 +159,7 @@ grit("google_chrome_strings") {
 #              (generate_chromium_strings action)
 grit("chromium_strings") {
   source = "chromium_strings.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/chromium_strings.h",
     "chromium_strings_am.pak",
diff --git a/chrome/app/resources/BUILD.gn b/chrome/app/resources/BUILD.gn
index e068f4b..1eec16c 100644
--- a/chrome/app/resources/BUILD.gn
+++ b/chrome/app/resources/BUILD.gn
@@ -8,6 +8,7 @@ import("//tools/grit/grit_rule.gni")
 #              (generate_locale_settings action)
 grit("locale_settings") {
   source = "locale_settings.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/locale_settings.h",
     "locale_settings_am.pak",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 34cff4b..cc46b34 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -613,6 +613,7 @@ static_library("browser") {
 # (generate_browser_resources action)
 grit("resources") {
   source = "browser_resources.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/browser_resources.h",
     "browser_resources.pak",
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 34a1778..4af74c8 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -14,6 +14,7 @@ gypi_values = exec_script(
 #              (generate_common_resources action)
 grit("resources") {
   source = "common_resources.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/common_resources.h",
     "common_resources.pak",
@@ -24,6 +25,7 @@ grit("resources") {
 #              (generate_extensions_api_resources action)
 grit("extensions_api_resources") {
   source = "extensions_api_resources.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/extensions_api_resources.h",
     "extensions_api_resources.pak",
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 64d423f..d621d24 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -15,6 +15,7 @@ gypi_values = exec_script(
 # (generate_renderer_resources action)
 grit("resources") {
   source = "resources/renderer_resources.grd"
+  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/renderer_resources.h",
     "renderer_resources_100_percent.pak",
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 0c0b453..f8fee97 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -86,7 +86,7 @@ repack("shell_and_test_pak") {
     "$root_gen_dir/chrome/common/extensions_api_resources.pak",
     # TODO(jamescook): Extract the extension/app related resources
     # from generated_resources_en-US.pak. http://crbug.com/397250
-    "$root_gen_dir/chrome/app/generated_resources_en-US.pak",
+    "$root_gen_dir/chrome/generated_resources_en-US.pak",
     "$root_gen_dir/chrome/renderer/renderer_resources_100_percent.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",