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

chrome/app/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//tools/grit/grit_rule.gni")
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 #              (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",
     "generated_resources_ar.pak",
     "generated_resources_bg.pak",
     "generated_resources_bn.pak",
     "generated_resources_ca.pak",
     "generated_resources_cs.pak",
     "generated_resources_da.pak",
     "generated_resources_de.pak",
@@ skipping 46 matching lines @@
   ]
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings_map
 action("make_generated_resources_map") {
   # Targets should depend on generated_resources_map instead.
   visibility = ":generated_resources_map"
 
   script = "//chrome/browser/metrics/variations/generate_resources_map.py"
 
-  inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
-  outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
+  inputs = [ "$target_gen_dir/grit/generated_resources.h" ]
+  outputs = [ "$target_gen_dir/generated_resources_map.cc" ]
 
   args = rebase_path(inputs, root_build_dir) +
       rebase_path(outputs, root_build_dir)
 
   deps = [ ":generated_resources" ]
 }
 
 # Collect the generated .cc file from make_generated_resources_map and put it
 # in a source set so targets that depend on it will link the source rather than
 # specifying it manually. This doesn't happen in the GYP build.
 source_set("generated_resources_map") {
   sources = get_target_outputs(":make_generated_resources_map")
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 #              (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",
     "google_chrome_strings_ar.pak",
     "google_chrome_strings_bg.pak",
     "google_chrome_strings_bn.pak",
     "google_chrome_strings_ca.pak",
     "google_chrome_strings_cs.pak",
     "google_chrome_strings_da.pak",
     "google_chrome_strings_de.pak",
@@ skipping 43 matching lines @@
     "google_chrome_strings_zh-CN.pak",
     "google_chrome_strings_zh-TW.pak",
     "google_chrome_strings_fake-bidi.pak",
   ]
 }
 
 # GYP version: chrome/chrome_resources.gyp: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",
     "chromium_strings_ar.pak",
     "chromium_strings_bg.pak",
     "chromium_strings_bn.pak",
     "chromium_strings_ca.pak",
     "chromium_strings_cs.pak",
     "chromium_strings_da.pak",
     "chromium_strings_de.pak",
@@ skipping 38 matching lines @@
     "chromium_strings_ta.pak",
     "chromium_strings_te.pak",
     "chromium_strings_th.pak",
     "chromium_strings_tr.pak",
     "chromium_strings_uk.pak",
     "chromium_strings_vi.pak",
     "chromium_strings_zh-CN.pak",
     "chromium_strings_zh-TW.pak",
   ]
 }