GN: Fix build after r289163 / r289149.

This reapplies r289149: GN: Specify grit generated output paths to be the same as gyp's.
together with outstanding CL: https://codereview.chromium.org/467023003/

TBR=brettw@chromium.org,thestig@chromium.org
NOTRY=true
NOTREECHECKS=true
BUG=

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

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

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",

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",

chrome/browser/BUILD.gn

@@ -614,6 +614,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",

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",

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",

content/shell/BUILD.gn

@@ -389,6 +389,7 @@ group("resources") {
 
 repack("pak") {
   sources = [
+    "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
@@ -398,7 +399,6 @@ repack("pak") {
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
-    "$root_gen_dir/webkit/blink_resources.pak",
     "$root_gen_dir/webkit/webkit_resources_100_percent.pak",
   ]
 

extensions/BUILD.gn

@@ -82,12 +82,12 @@ source_set("test_support") {
 # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
 repack("shell_and_test_pak") {
   sources = [
-    "$root_gen_dir/chrome/common/common_resources.pak",
-    "$root_gen_dir/chrome/common/extensions_api_resources.pak",
+    "$root_gen_dir/chrome/common_resources.pak",
+    "$root_gen_dir/chrome/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/renderer/renderer_resources_100_percent.pak",
+    "$root_gen_dir/chrome/generated_resources_en-US.pak",
+    "$root_gen_dir/chrome/renderer_resources_100_percent.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",
     "$root_gen_dir/extensions/extensions_renderer_resources.pak",

webkit/glue/resources/BUILD.gn

@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni")
 
 grit("resources") {
   source = "webkit_resources.grd"
+  output_dir = "$root_gen_dir/webkit"
   outputs = [
     "grit/webkit_resources.h",
     "webkit_resources_100_percent.pak",