Encode all grit outputs in .gn files

This finishes the rest of the Grit outputs that was started in a previous pass, and removes the ability to optionally deduce outputs at GN-time (which is slow so we don't want to do it).

R=viettrungluu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284947 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 911 insertions, 331 deletions

diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn
index bb7de97..25f61ec 100644
--- a/ash/resources/BUILD.gn
+++ b/ash/resources/BUILD.gn
@@ -6,4 +6,9 @@ import("//tools/grit/grit_rule.gni")
 
 grit("resources") {
   source = "ash_resources.grd"
+  outputs = [
+    "grit/ash_resources.h",
+    "ash_resources_100_percent.pak",
+    "ash_resources_200_percent.pak",
+  ]
 }
diff --git a/ash/strings/BUILD.gn b/ash/strings/BUILD.gn
index 9c4ab9f..af2069a 100644
--- a/ash/strings/BUILD.gn
+++ b/ash/strings/BUILD.gn
@@ -6,4 +6,61 @@ import("//tools/grit/grit_rule.gni")
 
 grit("strings") {
   source = "../ash_strings.grd"
+  outputs = [
+    "grit/ash_strings.h",
+    "ash_strings_am.pak",
+    "ash_strings_ar.pak",
+    "ash_strings_bg.pak",
+    "ash_strings_bn.pak",
+    "ash_strings_ca.pak",
+    "ash_strings_cs.pak",
+    "ash_strings_da.pak",
+    "ash_strings_de.pak",
+    "ash_strings_el.pak",
+    "ash_strings_en-GB.pak",
+    "ash_strings_en-US.pak",
+    "ash_strings_es.pak",
+    "ash_strings_es-419.pak",
+    "ash_strings_et.pak",
+    "ash_strings_fa.pak",
+    "ash_strings_fake-bidi.pak",
+    "ash_strings_fi.pak",
+    "ash_strings_fil.pak",
+    "ash_strings_fr.pak",
+    "ash_strings_gu.pak",
+    "ash_strings_he.pak",
+    "ash_strings_hi.pak",
+    "ash_strings_hr.pak",
+    "ash_strings_hu.pak",
+    "ash_strings_id.pak",
+    "ash_strings_it.pak",
+    "ash_strings_ja.pak",
+    "ash_strings_kn.pak",
+    "ash_strings_ko.pak",
+    "ash_strings_lt.pak",
+    "ash_strings_lv.pak",
+    "ash_strings_ml.pak",
+    "ash_strings_mr.pak",
+    "ash_strings_ms.pak",
+    "ash_strings_nl.pak",
+    "ash_strings_nb.pak",
+    "ash_strings_pl.pak",
+    "ash_strings_pt-BR.pak",
+    "ash_strings_pt-PT.pak",
+    "ash_strings_ro.pak",
+    "ash_strings_ru.pak",
+    "ash_strings_sk.pak",
+    "ash_strings_sl.pak",
+    "ash_strings_sr.pak",
+    "ash_strings_sv.pak",
+    "ash_strings_sw.pak",
+    "ash_strings_ta.pak",
+    "ash_strings_te.pak",
+    "ash_strings_th.pak",
+    "ash_strings_tr.pak",
+    "ash_strings_uk.pak",
+    "ash_strings_vi.pak",
+    "ash_strings_zh-CN.pak",
+    "ash_strings_zh-TW.pak",
+  ]
 }
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 662a501..f18c86a 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -335,6 +335,7 @@ template("android_resources") {
 # Variables
 #   deps: Specifies the dependencies of this target.
 #   grd_file: Path to the .grd file to generate strings.xml from.
+#   outputs: Expected grit outputs (see grit rule).
 #
 # Example
 #  java_strings_grd("foo_strings_grd") {
@@ -351,8 +352,11 @@ template("java_strings_grd") {
     }
   }
 
+  # Put grit files into this subdirectory of target_gen_dir.
+  extra_output_path = target_name + "_grit_output"
+
   grit_target_name = "${target_name}__grit"
-  grit_output_dir = base_path + "_grit_output"
+  grit_output_dir = "$target_gen_dir/$extra_output_path"
   grit(grit_target_name) {
     grit_flags = [
       "-E", "ANDROID_JAVA_TAGGED_ONLY=false",
@@ -360,6 +364,10 @@ template("java_strings_grd") {
     output_dir = grit_output_dir
     resource_ids = ""
     source = invoker.grd_file
+    # The grit rule expects files relative to target_gen_dir, but this rule
+    # appends a suffix to that. This rebase will prepend extra_output_path to
+    # each filename.
+    outputs = rebase_path(invoker.outputs, ".", extra_output_path)
   }
 
   # This needs to get outputs from grit's internal target, not the final
diff --git a/build/secondary/chrome/BUILD.gn b/build/secondary/chrome/BUILD.gn
deleted file mode 100644
index 4fdd5aa..0000000
--- a/build/secondary/chrome/BUILD.gn
+++ /dev/null
@@ -1,299 +0,0 @@
-# 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("//build/config/crypto.gni")
-import("//build/config/ui.gni")
-import("//tools/grit/grit_rule.gni")
-
-executable("chrome") {
-  sources = [
-    "app/breakpad_field_trial_win.cc",
-    "app/breakpad_field_trial_win.h",
-    "app/breakpad_win.cc",
-    "app/breakpad_win.h",
-    "app/chrome_dll_resource.h",
-    "app/chrome_exe_main_aura.cc",
-    "app/chrome_exe_main_gtk.cc",
-    "app/chrome_exe_main_mac.cc",
-    "app/chrome_exe_main_win.cc",
-    "app/chrome_exe_resource.h",
-    "app/chrome_main.cc",
-    "app/chrome_main_delegate.cc",
-    "app/chrome_main_delegate.h",
-    "app/client_util.cc",
-    "app/client_util.h",
-    "app/hard_error_handler_win.cc",
-    "app/hard_error_handler_win.h",
-    "app/metro_driver_win.cc",
-    "app/metro_driver_win.h",
-    "../content/app/startup_helper_win.cc",
-  ]
-
-  if (is_linux) {
-    configs += [
-      # TODO(brettw) this is wrong, it should be picked up from deps.
-      "//build/config/linux:gtk",
-      "//build/config/linux:x11",
-    ]
-  }
-
-  deps = [
-    # TODO(brettw) this is right on linux? Everything is linked into the
-    # exe, but wrong on Windows, where chrome_exe and chrome_dll are separate.
-    ":browser",
-    ":common",
-    ":debugger",
-    ":plugin",
-    ":renderer",
-    ":utility",
-    "//base",
-  ]
-
-  # TODO(brettw) this isn't right for all platforms.
-  if (!use_aura) {
-    sources -= [ "app/chrome_exe_main_aura.cc" ]
-  }
-
-  if (!is_win) {
-    sources -= [
-      "app/client_util.cc",
-      "app/client_util.h",
-    ]
-  }
-}
-
-static_library("browser") {
-  if (is_linux) {
-    configs += [
-      "//build/config/linux:x11",
-    ]
-  }
-
-  deps = [
-    "//third_party/expat",
-  ]
-}
-
-static_library("common") {
-  if (!use_openssl && is_linux) {
-    # common/net uses NSS.
-    # TODO(brettw) have a better way to express this without having to do
-    # "if (use_nss)" everywhere.
-    configs += [ "//third_party/nss:nss_linux_config" ]
-  }
-  deps = [
-  ]
-}
-
-# TODO(brettw) move to browser/devtools/BUILD.gn
-source_set("debugger") {
-  sources = [
-    "browser/devtools/device/adb/adb_client_socket.cc",
-    "browser/devtools/device/adb/adb_client_socket.h",
-    "browser/devtools/device/adb/adb_device_info_query.h",
-    "browser/devtools/device/adb/adb_device_info_query.cc",
-    "browser/devtools/device/adb/adb_device_provider.cc",
-    "browser/devtools/device/adb/adb_device_provider.h",
-    "browser/devtools/device/android_device_manager.cc",
-    "browser/devtools/device/android_device_manager.h",
-    "browser/devtools/device/android_web_socket.cc",
-    "browser/devtools/device/devtools_android_bridge.cc",
-    "browser/devtools/device/devtools_android_bridge.h",
-    "browser/devtools/device/port_forwarding_controller.cc",
-    "browser/devtools/device/port_forwarding_controller.h",
-    "browser/devtools/device/self_device_provider.cc",
-    "browser/devtools/device/self_device_provider.h",
-    "browser/devtools/device/usb/android_rsa.cc",
-    "browser/devtools/device/usb/android_rsa.h",
-    "browser/devtools/device/usb/android_usb_device.cc",
-    "browser/devtools/device/usb/android_usb_device.h",
-    "browser/devtools/device/usb/android_usb_socket.cc",
-    "browser/devtools/device/usb/android_usb_socket.h",
-    "browser/devtools/device/usb/usb_device_provider.cc",
-    "browser/devtools/device/usb/usb_device_provider.h",
-    "browser/devtools/browser_list_tabcontents_provider.cc",
-    "browser/devtools/browser_list_tabcontents_provider.h",
-    "browser/devtools/devtools_contents_resizing_strategy.cc",
-    "browser/devtools/devtools_contents_resizing_strategy.h",
-    "browser/devtools/devtools_embedder_message_dispatcher.cc",
-    "browser/devtools/devtools_embedder_message_dispatcher.h",
-    "browser/devtools/devtools_file_helper.cc",
-    "browser/devtools/devtools_file_helper.h",
-    "browser/devtools/devtools_file_system_indexer.cc",
-    "browser/devtools/devtools_file_system_indexer.h",
-    "browser/devtools/devtools_network_controller.cpp",
-    "browser/devtools/devtools_network_controller.h",
-    "browser/devtools/devtools_network_transaction.cpp",
-    "browser/devtools/devtools_network_transaction.h",
-    "browser/devtools/devtools_network_transaction_factory.cpp",
-    "browser/devtools/devtools_network_transaction_factory.h",
-    "browser/devtools/devtools_protocol.cc",
-    "browser/devtools/devtools_protocol.h",
-    "browser/devtools/devtools_toggle_action.h",
-    "browser/devtools/devtools_window.cc",
-    "browser/devtools/devtools_window.h",
-    "browser/devtools/remote_debugging_server.cc",
-    "browser/devtools/remote_debugging_server.h",
-  ]
-
-  deps = [
-#    ":chrome_extra_resources",
-#    ":chrome_resources",
-#    ":chrome_strings",
-#    ":theme_resources",
-    "//base",
-    "//net",
-    "//net:http_server",
-    "//skia",
-    "//third_party/icu",
-    "//third_party/leveldatabase",
-    "//third_party/libusb",
-  ]
-
-  if (is_android) {
-    sources -= [
-      "browser/devtools/adb/android_rsa.cc",
-      "browser/devtools/browser_list_tabcontents_provider.cc",
-      "browser/devtools/devtools_file_system_indexer.cc",
-      "browser/devtools/devtools_window.cc",
-      "browser/devtools/remote_debugging_server.cc",
-    ]
-    deps -= [ "//third_party/libusb" ]
-  }
-
-  # TODO implement debug_devtools
-  # if (debug_devtools) {
-  #   defines = [ "DEBUG_DEVTOOLS=1" ]
-  # }
-  # TODO(brettw) this may be required on Windows:
-  # if (is_win) {
-  #   TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  #   'msvs_disabled_warnings': [ 4267, ]
-  # }
-
-}
-
-source_set("plugin") {
-}
-
-source_set("renderer") {
-}
-
-source_set("utility") {
-}
-
-
-# Credits ----------------------------------------------------------------------
-
-about_credits_file = "$root_gen_dir/about_credits.html"
-build_relative_about_credits_file =
-  rebase_path(about_credits_file, root_build_dir)
-
-action("about_credits") {
-  script = "//tools/licenses.py"
-  outputs = [ about_credits_file ]
-
-  # This script is impossible to write proper input dependencies for because it
-  # basically greps the source tree for third_party directories. If a directory
-  # is added or removed, it will change the result, but there is no way to
-  # express this as a build dependency. We approximate this by depending on
-  # the last change file to force an update whenever the code is updated.
-  inputs = [ "//build/util/LASTCHANGE" ]
-
-  args = [ "credits", build_relative_about_credits_file ]
-}
-
-# Resources --------------------------------------------------------------------
-
-#group("chrome_resources") {
-#  deps = [
-#    ":browser_resources",
-#    ":common_resources",
-#    ":renderer_resources",
-#  ]
-#}
-#grit("browser_resources") {
-#  source = "browser/browser_resources.grd"
-#  grit_flags = [ "-E", "about_credits_file=$build_relative_about_credits_file" ]
-#  deps = [ ":about_credits" ]
-#}
-#grit("common_resources") {
-#  source = "common/common_resources.grd"
-#}
-#grit("renderer_resources") {
-#  source = "renderer/resources/renderer_resources.grd"
-#}
-#
-#group("chrome_strings") {
-#  deps = [
-#    ":locale_settings",
-#    ":chromium_strings",
-#    ":generated_resources",
-#    ":google_chrome_strings",
-#  ]
-#}
-#grit("locale_settings") {
-#  source = "app/resources/locale_settings.grd"
-#}
-#grit("chromium_strings") {
-#  source = "app/chromium_strings.grd"
-#}
-#grit("generated_resources") {
-#  source = "app/generated_resources.grd"
-#}
-#grit("google_chrome_strings") {
-#  source = "app/google_chrome_strings.grd"
-#}
-#
-#group("chrome_extra_resources") {
-#  deps = [
-#    ":memory_internals_resources",
-#    ":net_internals_resources",
-#    ":signin_internals_resources",
-#    ":sync_internals_resources",
-#    ":translate_internals_resources",
-#  ]
-#
-#  if (!is_ios) {
-#    deps += [
-#      ":component_extension_resources",
-#      ":options_resources",
-#      ":quota_internals_resources",
-#      ":sync_file_system_internals_resources",
-#    ]
-#  }
-#}
-#grit("component_extension_resources") {
-#  source = "browser/resources/component_extension_resources.grd"
-#}
-#grit("memory_internals_resources") {
-#  source = "browser/resources/memory_internals_resources.grd"
-#}
-#grit("quota_internals_resources") {
-#  source = "browser/resources/quota_internals_resources.grd"
-#}
-#grit("net_internals_resources") {
-#  source = "browser/resources/net_internals_resources.grd"
-#}
-#grit("options_resources") {
-#  source = "browser/resources/options_resources.grd"
-#}
-#grit("signin_internals_resources") {
-#  source = "browser/resources/signin_internals_resources.grd"
-#}
-#grit("sync_file_system_internals_resources") {
-#  source = "browser/resources/sync_file_system_internals_resources.grd"
-#}
-#grit("sync_internals_resources") {
-#  source = "browser/resources/sync_internals_resources.grd"
-#}
-#grit("translate_internals_resources") {
-#  source = "browser/resources/translate_internals_resources.grd"
-#}
-#
-## TODO(brettw) rename "app_theme_resources" or something when we don't support
-## GYP any more. This name is required to match the GYP build.
-#grit("theme_resources") {
-#  source = "app/theme/theme_resources.grd"
-#}
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni
index 178fb64..6d88f58 100644
--- a/build/secondary/tools/grit/grit_rule.gni
+++ b/build/secondary/tools/grit/grit_rule.gni
@@ -7,10 +7,10 @@
 #
 # Parameters
 #
-#   source
+#   source (required)
 #       Path to .grd file.
 #
-#   outputs (optional)
+#   outputs (required)
 #       List of outputs from grit, relative to the target_gen_dir. If supplied,
 #       a call to Grit to compute the outputs can be skipped which will make
 #       GN run faster. Grit will verify at build time that this list is correct
@@ -45,7 +45,13 @@
 # Example
 #
 #   grit("my_resources") {
-#     source = "myfile.grd"  # source is required.
+#     # Source and outputs are required.
+#     source = "myfile.grd"
+#     outputs = [
+#       "foo_strings.h",
+#       "foo_strings.pak",
+#     ]
+#
 #     grit_flags = [ "-E", "foo=bar" ]  # Optional extra flags.
 #     # You can also put deps here if the grit source depends on generated
 #     # files.
@@ -212,34 +218,20 @@ template("grit") {
   grit_inputs = [ invoker.source ]
 
   assert_files_flags = []
-  if (defined(invoker.outputs)) {
-    # If the declaration specified outputs, we want to make sure that they
-    # actually match what Grit is writing. We write the list to a file (some
-    # of the output lists are long enough to not fit on a Windows command line)
-    # and ask Grit to verify those are the actual outputs at runtime.
-    asserted_list_file = "$target_out_dir/${target_name}_expected_outputs.txt"
-    write_file(asserted_list_file,
-               rebase_path(invoker.outputs, root_build_dir, target_gen_dir))
-    assert_files_flags += [
-      "--assert-file-list=" + rebase_path(asserted_list_file, root_build_dir),
-    ]
-    grit_outputs = get_path_info(
-        rebase_path(invoker.outputs, ".", target_gen_dir),
-        "abspath")
-  } else {
-    # Ask Grit for the output list.
-    grit_outputs_build_rel = exec_script(grit_info_script,
-      [ "--outputs", "$rebased_output_dir", source_path, "-f", resource_ids ] +
-      grit_flags,
-      "list lines")
-
-    # The names returned by grit are relative to the current (build) directory,
-    # but references to files in this template are expected to be relative to
-    # the invoking BUILD.gn file's directory. Make it absolute so there's no
-    # ambiguity.
-    grit_outputs = get_path_info(
-        rebase_path(grit_outputs_build_rel, ".", root_build_dir), "abspath")
-  }
+
+  # We want to make sure the declared outputs actually match what Grit is
+  # writing. We write the list to a file (some of the output lists are long
+  # enough to not fit on a Windows command line) and ask Grit to verify those
+  # are the actual outputs at runtime.
+  asserted_list_file = "$target_out_dir/${target_name}_expected_outputs.txt"
+  write_file(asserted_list_file,
+             rebase_path(invoker.outputs, root_build_dir, target_gen_dir))
+  assert_files_flags += [
+    "--assert-file-list=" + rebase_path(asserted_list_file, root_build_dir),
+  ]
+  grit_outputs = get_path_info(
+      rebase_path(invoker.outputs, ".", target_gen_dir),
+      "abspath")
 
   # The config and the action below get this visibility son only the generated
   # source set can depend on them. The variable "target_name" will get
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 6be2ff3..80becce 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -8,6 +8,63 @@ import("//tools/grit/grit_rule.gni")
 #              (generate_generated_resources action)
 grit("generated_resources") {
   source = "generated_resources.grd"
+  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",
+    "generated_resources_el.pak",
+    "generated_resources_en-GB.pak",
+    "generated_resources_en-US.pak",
+    "generated_resources_es.pak",
+    "generated_resources_es-419.pak",
+    "generated_resources_et.pak",
+    "generated_resources_fa.pak",
+    "generated_resources_fake-bidi.pak",
+    "generated_resources_fi.pak",
+    "generated_resources_fil.pak",
+    "generated_resources_fr.pak",
+    "generated_resources_gu.pak",
+    "generated_resources_he.pak",
+    "generated_resources_hi.pak",
+    "generated_resources_hr.pak",
+    "generated_resources_hu.pak",
+    "generated_resources_id.pak",
+    "generated_resources_it.pak",
+    "generated_resources_ja.pak",
+    "generated_resources_kn.pak",
+    "generated_resources_ko.pak",
+    "generated_resources_lt.pak",
+    "generated_resources_lv.pak",
+    "generated_resources_ml.pak",
+    "generated_resources_mr.pak",
+    "generated_resources_ms.pak",
+    "generated_resources_nl.pak",
+    "generated_resources_nb.pak",
+    "generated_resources_pl.pak",
+    "generated_resources_pt-BR.pak",
+    "generated_resources_pt-PT.pak",
+    "generated_resources_ro.pak",
+    "generated_resources_ru.pak",
+    "generated_resources_sk.pak",
+    "generated_resources_sl.pak",
+    "generated_resources_sr.pak",
+    "generated_resources_sv.pak",
+    "generated_resources_sw.pak",
+    "generated_resources_ta.pak",
+    "generated_resources_te.pak",
+    "generated_resources_th.pak",
+    "generated_resources_tr.pak",
+    "generated_resources_uk.pak",
+    "generated_resources_vi.pak",
+    "generated_resources_zh-CN.pak",
+    "generated_resources_zh-TW.pak",
+  ]
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings_map
@@ -37,10 +94,124 @@ source_set("generated_resources_map") {
 #              (generate_google_chrome_strings action)
 grit("google_chrome_strings") {
   source = "google_chrome_strings.grd"
+  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",
+    "google_chrome_strings_el.pak",
+    "google_chrome_strings_en-GB.pak",
+    "google_chrome_strings_en-US.pak",
+    "google_chrome_strings_es.pak",
+    "google_chrome_strings_es-419.pak",
+    "google_chrome_strings_et.pak",
+    "google_chrome_strings_fa.pak",
+    "google_chrome_strings_fi.pak",
+    "google_chrome_strings_fil.pak",
+    "google_chrome_strings_fr.pak",
+    "google_chrome_strings_gu.pak",
+    "google_chrome_strings_he.pak",
+    "google_chrome_strings_hi.pak",
+    "google_chrome_strings_hr.pak",
+    "google_chrome_strings_hu.pak",
+    "google_chrome_strings_id.pak",
+    "google_chrome_strings_it.pak",
+    "google_chrome_strings_ja.pak",
+    "google_chrome_strings_kn.pak",
+    "google_chrome_strings_ko.pak",
+    "google_chrome_strings_lt.pak",
+    "google_chrome_strings_lv.pak",
+    "google_chrome_strings_ml.pak",
+    "google_chrome_strings_mr.pak",
+    "google_chrome_strings_ms.pak",
+    "google_chrome_strings_nl.pak",
+    "google_chrome_strings_nb.pak",
+    "google_chrome_strings_pl.pak",
+    "google_chrome_strings_pt-BR.pak",
+    "google_chrome_strings_pt-PT.pak",
+    "google_chrome_strings_ro.pak",
+    "google_chrome_strings_ru.pak",
+    "google_chrome_strings_sk.pak",
+    "google_chrome_strings_sl.pak",
+    "google_chrome_strings_sr.pak",
+    "google_chrome_strings_sv.pak",
+    "google_chrome_strings_sw.pak",
+    "google_chrome_strings_ta.pak",
+    "google_chrome_strings_te.pak",
+    "google_chrome_strings_th.pak",
+    "google_chrome_strings_tr.pak",
+    "google_chrome_strings_uk.pak",
+    "google_chrome_strings_vi.pak",
+    "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"
+  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",
+    "chromium_strings_el.pak",
+    "chromium_strings_en-GB.pak",
+    "chromium_strings_en-US.pak",
+    "chromium_strings_es.pak",
+    "chromium_strings_es-419.pak",
+    "chromium_strings_et.pak",
+    "chromium_strings_fa.pak",
+    "chromium_strings_fake-bidi.pak",
+    "chromium_strings_fi.pak",
+    "chromium_strings_fil.pak",
+    "chromium_strings_fr.pak",
+    "chromium_strings_gu.pak",
+    "chromium_strings_he.pak",
+    "chromium_strings_hi.pak",
+    "chromium_strings_hr.pak",
+    "chromium_strings_hu.pak",
+    "chromium_strings_id.pak",
+    "chromium_strings_it.pak",
+    "chromium_strings_ja.pak",
+    "chromium_strings_kn.pak",
+    "chromium_strings_ko.pak",
+    "chromium_strings_lt.pak",
+    "chromium_strings_lv.pak",
+    "chromium_strings_ml.pak",
+    "chromium_strings_mr.pak",
+    "chromium_strings_ms.pak",
+    "chromium_strings_nl.pak",
+    "chromium_strings_nb.pak",
+    "chromium_strings_pl.pak",
+    "chromium_strings_pt-BR.pak",
+    "chromium_strings_pt-PT.pak",
+    "chromium_strings_ro.pak",
+    "chromium_strings_ru.pak",
+    "chromium_strings_sk.pak",
+    "chromium_strings_sl.pak",
+    "chromium_strings_sr.pak",
+    "chromium_strings_sv.pak",
+    "chromium_strings_sw.pak",
+    "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",
+  ]
 }
diff --git a/chrome/app/resources/BUILD.gn b/chrome/app/resources/BUILD.gn
index 8082472..e068f4b 100644
--- a/chrome/app/resources/BUILD.gn
+++ b/chrome/app/resources/BUILD.gn
@@ -8,6 +8,63 @@ import("//tools/grit/grit_rule.gni")
 #              (generate_locale_settings action)
 grit("locale_settings") {
   source = "locale_settings.grd"
+  outputs = [
+    "grit/locale_settings.h",
+    "locale_settings_am.pak",
+    "locale_settings_ar.pak",
+    "locale_settings_bg.pak",
+    "locale_settings_bn.pak",
+    "locale_settings_ca.pak",
+    "locale_settings_cs.pak",
+    "locale_settings_da.pak",
+    "locale_settings_de.pak",
+    "locale_settings_el.pak",
+    "locale_settings_en-GB.pak",
+    "locale_settings_en-US.pak",
+    "locale_settings_es.pak",
+    "locale_settings_es-419.pak",
+    "locale_settings_et.pak",
+    "locale_settings_fa.pak",
+    "locale_settings_fake-bidi.pak",
+    "locale_settings_fi.pak",
+    "locale_settings_fil.pak",
+    "locale_settings_fr.pak",
+    "locale_settings_gu.pak",
+    "locale_settings_he.pak",
+    "locale_settings_hi.pak",
+    "locale_settings_hr.pak",
+    "locale_settings_hu.pak",
+    "locale_settings_id.pak",
+    "locale_settings_it.pak",
+    "locale_settings_ja.pak",
+    "locale_settings_kn.pak",
+    "locale_settings_ko.pak",
+    "locale_settings_lt.pak",
+    "locale_settings_lv.pak",
+    "locale_settings_ml.pak",
+    "locale_settings_mr.pak",
+    "locale_settings_ms.pak",
+    "locale_settings_nl.pak",
+    "locale_settings_nb.pak",
+    "locale_settings_pl.pak",
+    "locale_settings_pt-BR.pak",
+    "locale_settings_pt-PT.pak",
+    "locale_settings_ro.pak",
+    "locale_settings_ru.pak",
+    "locale_settings_sk.pak",
+    "locale_settings_sl.pak",
+    "locale_settings_sr.pak",
+    "locale_settings_sv.pak",
+    "locale_settings_sw.pak",
+    "locale_settings_ta.pak",
+    "locale_settings_te.pak",
+    "locale_settings_th.pak",
+    "locale_settings_tr.pak",
+    "locale_settings_uk.pak",
+    "locale_settings_vi.pak",
+    "locale_settings_zh-CN.pak",
+    "locale_settings_zh-TW.pak",
+  ]
 }
 
 # GYP version: chrome/chrome_resources.gyp:platform_locale_settings
@@ -26,4 +83,62 @@ grit("platform_locale_settings") {
     # All other posix systems just use the Linux one.
     source = "locale_settings_linux.grd"
   }
+
+  outputs = [
+    "grit/platform_locale_settings.h",
+    "platform_locale_settings_am.pak",
+    "platform_locale_settings_ar.pak",
+    "platform_locale_settings_bg.pak",
+    "platform_locale_settings_bn.pak",
+    "platform_locale_settings_ca.pak",
+    "platform_locale_settings_cs.pak",
+    "platform_locale_settings_da.pak",
+    "platform_locale_settings_de.pak",
+    "platform_locale_settings_el.pak",
+    "platform_locale_settings_en-GB.pak",
+    "platform_locale_settings_en-US.pak",
+    "platform_locale_settings_es.pak",
+    "platform_locale_settings_es-419.pak",
+    "platform_locale_settings_et.pak",
+    "platform_locale_settings_fa.pak",
+    "platform_locale_settings_fake-bidi.pak",
+    "platform_locale_settings_fi.pak",
+    "platform_locale_settings_fil.pak",
+    "platform_locale_settings_fr.pak",
+    "platform_locale_settings_gu.pak",
+    "platform_locale_settings_he.pak",
+    "platform_locale_settings_hi.pak",
+    "platform_locale_settings_hr.pak",
+    "platform_locale_settings_hu.pak",
+    "platform_locale_settings_id.pak",
+    "platform_locale_settings_it.pak",
+    "platform_locale_settings_ja.pak",
+    "platform_locale_settings_kn.pak",
+    "platform_locale_settings_ko.pak",
+    "platform_locale_settings_lt.pak",
+    "platform_locale_settings_lv.pak",
+    "platform_locale_settings_ml.pak",
+    "platform_locale_settings_mr.pak",
+    "platform_locale_settings_ms.pak",
+    "platform_locale_settings_nl.pak",
+    "platform_locale_settings_nb.pak",
+    "platform_locale_settings_pl.pak",
+    "platform_locale_settings_pt-BR.pak",
+    "platform_locale_settings_pt-PT.pak",
+    "platform_locale_settings_ro.pak",
+    "platform_locale_settings_ru.pak",
+    "platform_locale_settings_sk.pak",
+    "platform_locale_settings_sl.pak",
+    "platform_locale_settings_sr.pak",
+    "platform_locale_settings_sv.pak",
+    "platform_locale_settings_sw.pak",
+    "platform_locale_settings_ta.pak",
+    "platform_locale_settings_te.pak",
+    "platform_locale_settings_th.pak",
+    "platform_locale_settings_tr.pak",
+    "platform_locale_settings_uk.pak",
+    "platform_locale_settings_vi.pak",
+    "platform_locale_settings_zh-CN.pak",
+    "platform_locale_settings_zh-TW.pak",
+  ]
 }
diff --git a/chrome/app/theme/BUILD.gn b/chrome/app/theme/BUILD.gn
index 5e1d2a5..0a3d97e 100644
--- a/chrome/app/theme/BUILD.gn
+++ b/chrome/app/theme/BUILD.gn
@@ -7,6 +7,13 @@ import("//tools/grit/grit_rule.gni")
 # GYP version: chrome/chrome_resources.gyp:theme_resources
 grit("theme_resources") {
   source = "theme_resources.grd"
+  outputs = [
+    "grit/theme_resources.h",
+    "grit/theme_resources_map.cc",
+    "grit/theme_resources_map.h",
+    "theme_resources_100_percent.pak",
+    "theme_resources_200_percent.pak",
+  ]
 
   deps = [
     ":chrome_unscaled_resources",
@@ -17,4 +24,8 @@ grit("theme_resources") {
 # GYP version: chrome/chrome_resources.gyp:chrome_unscaled_resources
 grit("chrome_unscaled_resources") {
   source = "chrome_unscaled_resources.grd"
+  outputs = [
+    "grit/chrome_unscaled_resources.h",
+    "chrome_unscaled_resources.pak",
+  ]
 }
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 25b8b18..c1dfd6f 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -14,12 +14,20 @@ gypi_values = exec_script(
 #              (generate_common_resources action)
 grit("resources") {
   source = "common_resources.grd"
+  outputs = [
+    "grit/common_resources.h",
+    "common_resources.pak",
+  ]
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_resources
 #              (generate_extensions_api_resources action)
 grit("extensions_api_resources") {
   source = "extensions_api_resources.grd"
+  outputs = [
+    "grit/extensions_api_resources.h",
+    "extensions_api_resources.pak",
+  ]
 }
 
 # GYP version: chrome/chrome_common.gyp:common
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 9974ed9..e622f4e 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -15,6 +15,11 @@ gypi_values = exec_script(
 # (generate_renderer_resources action)
 grit("resources") {
   source = "resources/renderer_resources.grd"
+  outputs = [
+    "grit/renderer_resources.h",
+    "renderer_resources_100_percent.pak",
+    "renderer_resources_200_percent.pak",
+  ]
 }
 
 static_library("renderer") {
diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn
index 5c27e28..28d1755 100644
--- a/components/resources/BUILD.gn
+++ b/components/resources/BUILD.gn
@@ -16,10 +16,19 @@ group("resources") {
 #              (generate_components_resources action)
 grit("components_resources") {
   source = "components_resources.grd"
+  outputs = [
+    "grit/component_resources.h",
+    "component_resources.pak",
+  ]
 }
 
 # GYP version: components/components_resources.gyp
 #              (generate_scaled_components_resources action)
 grit("components_scaled_resources") {
   source = "components_scaled_resources.grd"
+  outputs = [
+    "grit/component_scaled_resources.h",
+    "component_resources_100_percent.pak",
+    "component_resources_200_percent.pak",
+  ]
 }
diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn
index e6287a5..ab42b5a 100644
--- a/components/strings/BUILD.gn
+++ b/components/strings/BUILD.gn
@@ -7,4 +7,61 @@ import("//tools/grit/grit_rule.gni")
 # GYP version: components/components_strings.gyp:components_strings
 grit("strings") {
   source = "../components_strings.grd"
+  outputs = [
+    "grit/components_strings.h",
+    "components_strings_am.pak",
+    "components_strings_ar.pak",
+    "components_strings_bg.pak",
+    "components_strings_bn.pak",
+    "components_strings_ca.pak",
+    "components_strings_cs.pak",
+    "components_strings_da.pak",
+    "components_strings_de.pak",
+    "components_strings_el.pak",
+    "components_strings_en-GB.pak",
+    "components_strings_en-US.pak",
+    "components_strings_es.pak",
+    "components_strings_es-419.pak",
+    "components_strings_et.pak",
+    "components_strings_fa.pak",
+    "components_strings_fake-bidi.pak",
+    "components_strings_fi.pak",
+    "components_strings_fil.pak",
+    "components_strings_fr.pak",
+    "components_strings_gu.pak",
+    "components_strings_he.pak",
+    "components_strings_hi.pak",
+    "components_strings_hr.pak",
+    "components_strings_hu.pak",
+    "components_strings_id.pak",
+    "components_strings_it.pak",
+    "components_strings_ja.pak",
+    "components_strings_kn.pak",
+    "components_strings_ko.pak",
+    "components_strings_lt.pak",
+    "components_strings_lv.pak",
+    "components_strings_ml.pak",
+    "components_strings_mr.pak",
+    "components_strings_ms.pak",
+    "components_strings_nl.pak",
+    "components_strings_nb.pak",
+    "components_strings_pl.pak",
+    "components_strings_pt-BR.pak",
+    "components_strings_pt-PT.pak",
+    "components_strings_ro.pak",
+    "components_strings_ru.pak",
+    "components_strings_sk.pak",
+    "components_strings_sl.pak",
+    "components_strings_sr.pak",
+    "components_strings_sv.pak",
+    "components_strings_sw.pak",
+    "components_strings_ta.pak",
+    "components_strings_te.pak",
+    "components_strings_th.pak",
+    "components_strings_tr.pak",
+    "components_strings_uk.pak",
+    "components_strings_vi.pak",
+    "components_strings_zh-CN.pak",
+    "components_strings_zh-TW.pak",
+  ]
 }
diff --git a/content/BUILD.gn b/content/BUILD.gn
index 20a553e..6c64270 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -38,6 +38,11 @@ if (is_component_build) {
 
 grit("resources") {
   source = "content_resources.grd"
+  outputs = [
+    "grit/content_resources.h",
+    "content_resources.pak",
+    "content_resources.rc",
+  ]
 }
 
 # This target exists to "hold" the content_export header so we can do proper
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index f291ada..b9f7657 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -119,6 +119,63 @@ static_library("bluetooth") {
 grit("strings") {
   visibility = ":*"
   source = "bluetooth_strings.grd"
+  outputs = [
+    "grit/device_bluetooth_strings.h",
+    "device_bluetooth_strings_am.pak",
+    "device_bluetooth_strings_ar.pak",
+    "device_bluetooth_strings_bg.pak",
+    "device_bluetooth_strings_bn.pak",
+    "device_bluetooth_strings_ca.pak",
+    "device_bluetooth_strings_cs.pak",
+    "device_bluetooth_strings_da.pak",
+    "device_bluetooth_strings_de.pak",
+    "device_bluetooth_strings_el.pak",
+    "device_bluetooth_strings_en-GB.pak",
+    "device_bluetooth_strings_en-US.pak",
+    "device_bluetooth_strings_es.pak",
+    "device_bluetooth_strings_es-419.pak",
+    "device_bluetooth_strings_et.pak",
+    "device_bluetooth_strings_fa.pak",
+    "device_bluetooth_strings_fake-bidi.pak",
+    "device_bluetooth_strings_fi.pak",
+    "device_bluetooth_strings_fil.pak",
+    "device_bluetooth_strings_fr.pak",
+    "device_bluetooth_strings_gu.pak",
+    "device_bluetooth_strings_he.pak",
+    "device_bluetooth_strings_hi.pak",
+    "device_bluetooth_strings_hr.pak",
+    "device_bluetooth_strings_hu.pak",
+    "device_bluetooth_strings_id.pak",
+    "device_bluetooth_strings_it.pak",
+    "device_bluetooth_strings_ja.pak",
+    "device_bluetooth_strings_kn.pak",
+    "device_bluetooth_strings_ko.pak",
+    "device_bluetooth_strings_lt.pak",
+    "device_bluetooth_strings_lv.pak",
+    "device_bluetooth_strings_ml.pak",
+    "device_bluetooth_strings_mr.pak",
+    "device_bluetooth_strings_ms.pak",
+    "device_bluetooth_strings_nl.pak",
+    "device_bluetooth_strings_nb.pak",
+    "device_bluetooth_strings_pl.pak",
+    "device_bluetooth_strings_pt-BR.pak",
+    "device_bluetooth_strings_pt-PT.pak",
+    "device_bluetooth_strings_ro.pak",
+    "device_bluetooth_strings_ru.pak",
+    "device_bluetooth_strings_sk.pak",
+    "device_bluetooth_strings_sl.pak",
+    "device_bluetooth_strings_sr.pak",
+    "device_bluetooth_strings_sv.pak",
+    "device_bluetooth_strings_sw.pak",
+    "device_bluetooth_strings_ta.pak",
+    "device_bluetooth_strings_te.pak",
+    "device_bluetooth_strings_th.pak",
+    "device_bluetooth_strings_tr.pak",
+    "device_bluetooth_strings_uk.pak",
+    "device_bluetooth_strings_vi.pak",
+    "device_bluetooth_strings_zh-CN.pak",
+    "device_bluetooth_strings_zh-TW.pak",
+  ]
 }
 
 static_library("mocks") {
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 47b4769..945d1c10 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -16,10 +16,18 @@ group("extensions_resources") {
 #              (exntensions_resources action)
 grit("extensions_resources_grd") {
   source = "extensions_resources.grd"
+  outputs = [
+    "grit/extensions_resources.h",
+    "extensions_resources.pak",
+  ]
 }
 
 # GYP version: extensions/extensions_resources.gyp:extensions_resources
 #              (exntensions_renderer_resources action)
 grit("extensions_renderer_resources") {
   source = "renderer/resources/extensions_renderer_resources.grd"
+  outputs = [
+    "grit/extensions_renderer_resources.h",
+    "extensions_renderer_resources.pak",
+  ]
 }
diff --git a/extensions/strings/BUILD.gn b/extensions/strings/BUILD.gn
index bdbca60..56005dc 100644
--- a/extensions/strings/BUILD.gn
+++ b/extensions/strings/BUILD.gn
@@ -10,4 +10,61 @@ grit("strings") {
   # the GYP version of this target. Weirdly, it does not match the input path.
   # The .grd should probably be moved here.
   source = "../extensions_strings.grd"
+  outputs = [
+    "grit/extensions_strings.h",
+    "extensions_strings_am.pak",
+    "extensions_strings_ar.pak",
+    "extensions_strings_bg.pak",
+    "extensions_strings_bn.pak",
+    "extensions_strings_ca.pak",
+    "extensions_strings_cs.pak",
+    "extensions_strings_da.pak",
+    "extensions_strings_de.pak",
+    "extensions_strings_el.pak",
+    "extensions_strings_en-GB.pak",
+    "extensions_strings_en-US.pak",
+    "extensions_strings_es.pak",
+    "extensions_strings_es-419.pak",
+    "extensions_strings_et.pak",
+    "extensions_strings_fa.pak",
+    "extensions_strings_fake-bidi.pak",
+    "extensions_strings_fi.pak",
+    "extensions_strings_fil.pak",
+    "extensions_strings_fr.pak",
+    "extensions_strings_gu.pak",
+    "extensions_strings_he.pak",
+    "extensions_strings_hi.pak",
+    "extensions_strings_hr.pak",
+    "extensions_strings_hu.pak",
+    "extensions_strings_id.pak",
+    "extensions_strings_it.pak",
+    "extensions_strings_ja.pak",
+    "extensions_strings_kn.pak",
+    "extensions_strings_ko.pak",
+    "extensions_strings_lt.pak",
+    "extensions_strings_lv.pak",
+    "extensions_strings_ml.pak",
+    "extensions_strings_mr.pak",
+    "extensions_strings_ms.pak",
+    "extensions_strings_nl.pak",
+    "extensions_strings_nb.pak",
+    "extensions_strings_pl.pak",
+    "extensions_strings_pt-BR.pak",
+    "extensions_strings_pt-PT.pak",
+    "extensions_strings_ro.pak",
+    "extensions_strings_ru.pak",
+    "extensions_strings_sk.pak",
+    "extensions_strings_sl.pak",
+    "extensions_strings_sr.pak",
+    "extensions_strings_sv.pak",
+    "extensions_strings_sw.pak",
+    "extensions_strings_ta.pak",
+    "extensions_strings_te.pak",
+    "extensions_strings_th.pak",
+    "extensions_strings_tr.pak",
+    "extensions_strings_uk.pak",
+    "extensions_strings_vi.pak",
+    "extensions_strings_zh-CN.pak",
+    "extensions_strings_zh-TW.pak",
+  ]
 }
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 07828b9..7cd7c95 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -545,6 +545,11 @@ component("net") {
 
 grit("net_resources") {
   source = "base/net_resources.grd"
+  outputs = [
+    "grit/net_resources.h",
+    "net_resources.pak",
+    "net_resources.rc",
+  ]
 }
 
 static_library("http_server") {
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index 8953700..9712249 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -33,6 +33,64 @@ libaddressinput_util_files = [
 # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings
 grit("strings") {
   source = "//chrome/app/address_input_strings.grd"
+  outputs = [
+    "messages.h",
+    "en_messages.cc",
+    "address_input_strings_am.pak",
+    "address_input_strings_ar.pak",
+    "address_input_strings_bg.pak",
+    "address_input_strings_bn.pak",
+    "address_input_strings_ca.pak",
+    "address_input_strings_cs.pak",
+    "address_input_strings_da.pak",
+    "address_input_strings_de.pak",
+    "address_input_strings_el.pak",
+    "address_input_strings_en-GB.pak",
+    "address_input_strings_en-US.pak",
+    "address_input_strings_es.pak",
+    "address_input_strings_es-419.pak",
+    "address_input_strings_et.pak",
+    "address_input_strings_fa.pak",
+    "address_input_strings_fake-bidi.pak",
+    "address_input_strings_fi.pak",
+    "address_input_strings_fil.pak",
+    "address_input_strings_fr.pak",
+    "address_input_strings_gu.pak",
+    "address_input_strings_he.pak",
+    "address_input_strings_hi.pak",
+    "address_input_strings_hr.pak",
+    "address_input_strings_hu.pak",
+    "address_input_strings_id.pak",
+    "address_input_strings_it.pak",
+    "address_input_strings_ja.pak",
+    "address_input_strings_kn.pak",
+    "address_input_strings_ko.pak",
+    "address_input_strings_lt.pak",
+    "address_input_strings_lv.pak",
+    "address_input_strings_ml.pak",
+    "address_input_strings_mr.pak",
+    "address_input_strings_ms.pak",
+    "address_input_strings_nl.pak",
+    "address_input_strings_nb.pak",
+    "address_input_strings_pl.pak",
+    "address_input_strings_pt-BR.pak",
+    "address_input_strings_pt-PT.pak",
+    "address_input_strings_ro.pak",
+    "address_input_strings_ru.pak",
+    "address_input_strings_sk.pak",
+    "address_input_strings_sl.pak",
+    "address_input_strings_sr.pak",
+    "address_input_strings_sv.pak",
+    "address_input_strings_sw.pak",
+    "address_input_strings_ta.pak",
+    "address_input_strings_te.pak",
+    "address_input_strings_th.pak",
+    "address_input_strings_tr.pak",
+    "address_input_strings_uk.pak",
+    "address_input_strings_vi.pak",
+    "address_input_strings_zh-CN.pak",
+    "address_input_strings_zh-TW.pak",
+  ]
 }
 
 config("libaddressinput_config") {
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
index d781721..8b2d7d5 100644
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -24,6 +24,52 @@ java_cpp_template("bitmap_format_srcjar") {
 
 java_strings_grd("ui_strings_grd") {
   grd_file = "java/strings/android_ui_strings.grd"
+  outputs = [
+    "values-am/android_ui_strings.xml",
+    "values-ar/android_ui_strings.xml",
+    "values-bg/android_ui_strings.xml",
+    "values-ca/android_ui_strings.xml",
+    "values-cs/android_ui_strings.xml",
+    "values-da/android_ui_strings.xml",
+    "values-de/android_ui_strings.xml",
+    "values-el/android_ui_strings.xml",
+    "values/android_ui_strings.xml",
+    "values-en-rGB/android_ui_strings.xml",
+    "values-es/android_ui_strings.xml",
+    "values-es-rUS/android_ui_strings.xml",
+    "values-fa/android_ui_strings.xml",
+    "values-fi/android_ui_strings.xml",
+    "values-tl/android_ui_strings.xml",
+    "values-fr/android_ui_strings.xml",
+    "values-hi/android_ui_strings.xml",
+    "values-hr/android_ui_strings.xml",
+    "values-hu/android_ui_strings.xml",
+    "values-in/android_ui_strings.xml",
+    "values-it/android_ui_strings.xml",
+    "values-iw/android_ui_strings.xml",
+    "values-ja/android_ui_strings.xml",
+    "values-ko/android_ui_strings.xml",
+    "values-lt/android_ui_strings.xml",
+    "values-lv/android_ui_strings.xml",
+    "values-nl/android_ui_strings.xml",
+    "values-nb/android_ui_strings.xml",
+    "values-pl/android_ui_strings.xml",
+    "values-pt-rBR/android_ui_strings.xml",
+    "values-pt-rPT/android_ui_strings.xml",
+    "values-ro/android_ui_strings.xml",
+    "values-ru/android_ui_strings.xml",
+    "values-sk/android_ui_strings.xml",
+    "values-sl/android_ui_strings.xml",
+    "values-sr/android_ui_strings.xml",
+    "values-sv/android_ui_strings.xml",
+    "values-sw/android_ui_strings.xml",
+    "values-th/android_ui_strings.xml",
+    "values-tr/android_ui_strings.xml",
+    "values-uk/android_ui_strings.xml",
+    "values-vi/android_ui_strings.xml",
+    "values-zh-rCN/android_ui_strings.xml",
+    "values-zh-rTW/android_ui_strings.xml",
+  ]
 }
 
 android_resources("ui_java_res") {
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index 1b3c87b..8c1c2a2 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -46,6 +46,12 @@ component("keyboard") {
 
 grit("resources_grit") {
   source = "keyboard_resources.grd"
+  outputs = [
+    "grit/keyboard_resources.h",
+    "grit/keyboard_resources_map.h",
+    "keyboard_resources.pak",
+    "keyboard_resources.rc",
+  ]
 }
 
 copy("resources") {
diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn
index a0584d6..e4dbd93 100644
--- a/ui/resources/BUILD.gn
+++ b/ui/resources/BUILD.gn
@@ -17,16 +17,33 @@ group("resources") {
 grit("ui_resources_grd") {
   visibility = ":resources"
   source = "ui_resources.grd"
+  outputs = [
+    "grit/ui_resources.h",
+    "grit/ui_resources_map.cc",
+    "grit/ui_resources_map.h",
+    "ui_resources_100_percent.pak",
+    "ui_resources_200_percent.pak",
+  ]
 }
 
 grit("ui_unscaled_resources_grd") {
   visibility = ":resources"
   source = "ui_unscaled_resources.grd"
+  outputs = [
+    "grit/ui_unscaled_resources.h",
+    "ui_unscaled_resources.rc",
+  ]
 }
 
 grit("webui_resources_grd") {
   visibility = ":resources"
   source = "../webui/resources/webui_resources.grd"
+  outputs = [
+    "grit/webui_resources.h",
+    "grit/webui_resources_map.cc",
+    "grit/webui_resources_map.h",
+    "webui_resources.pak",
+  ]
 }
 
 if (!is_mac) {
diff --git a/ui/strings/BUILD.gn b/ui/strings/BUILD.gn
index 0b4cfc8..719717c 100644
--- a/ui/strings/BUILD.gn
+++ b/ui/strings/BUILD.gn
@@ -15,8 +15,122 @@ group("strings") {
 
 grit("ui_strings") {
   source = "ui_strings.grd"
+  outputs = [
+    "grit/ui_strings.h",
+    "ui_strings_am.pak",
+    "ui_strings_ar.pak",
+    "ui_strings_bg.pak",
+    "ui_strings_bn.pak",
+    "ui_strings_ca.pak",
+    "ui_strings_cs.pak",
+    "ui_strings_da.pak",
+    "ui_strings_de.pak",
+    "ui_strings_el.pak",
+    "ui_strings_en-GB.pak",
+    "ui_strings_en-US.pak",
+    "ui_strings_es.pak",
+    "ui_strings_es-419.pak",
+    "ui_strings_et.pak",
+    "ui_strings_fa.pak",
+    "ui_strings_fake-bidi.pak",
+    "ui_strings_fi.pak",
+    "ui_strings_fil.pak",
+    "ui_strings_fr.pak",
+    "ui_strings_gu.pak",
+    "ui_strings_he.pak",
+    "ui_strings_hi.pak",
+    "ui_strings_hr.pak",
+    "ui_strings_hu.pak",
+    "ui_strings_id.pak",
+    "ui_strings_it.pak",
+    "ui_strings_ja.pak",
+    "ui_strings_kn.pak",
+    "ui_strings_ko.pak",
+    "ui_strings_lt.pak",
+    "ui_strings_lv.pak",
+    "ui_strings_ml.pak",
+    "ui_strings_mr.pak",
+    "ui_strings_ms.pak",
+    "ui_strings_nl.pak",
+    "ui_strings_nb.pak",
+    "ui_strings_pl.pak",
+    "ui_strings_pt-BR.pak",
+    "ui_strings_pt-PT.pak",
+    "ui_strings_ro.pak",
+    "ui_strings_ru.pak",
+    "ui_strings_sk.pak",
+    "ui_strings_sl.pak",
+    "ui_strings_sr.pak",
+    "ui_strings_sv.pak",
+    "ui_strings_sw.pak",
+    "ui_strings_ta.pak",
+    "ui_strings_te.pak",
+    "ui_strings_th.pak",
+    "ui_strings_tr.pak",
+    "ui_strings_uk.pak",
+    "ui_strings_vi.pak",
+    "ui_strings_zh-CN.pak",
+    "ui_strings_zh-TW.pak",
+  ]
 }
 
 grit("app_locale_settings") {
   source = "app_locale_settings.grd"
+  outputs = [
+    "grit/app_locale_settings.h",
+    "app_locale_settings_am.pak",
+    "app_locale_settings_ar.pak",
+    "app_locale_settings_bg.pak",
+    "app_locale_settings_bn.pak",
+    "app_locale_settings_ca.pak",
+    "app_locale_settings_cs.pak",
+    "app_locale_settings_da.pak",
+    "app_locale_settings_de.pak",
+    "app_locale_settings_el.pak",
+    "app_locale_settings_en-GB.pak",
+    "app_locale_settings_en-US.pak",
+    "app_locale_settings_es.pak",
+    "app_locale_settings_es-419.pak",
+    "app_locale_settings_et.pak",
+    "app_locale_settings_fa.pak",
+    "app_locale_settings_fake-bidi.pak",
+    "app_locale_settings_fi.pak",
+    "app_locale_settings_fil.pak",
+    "app_locale_settings_fr.pak",
+    "app_locale_settings_gu.pak",
+    "app_locale_settings_he.pak",
+    "app_locale_settings_hi.pak",
+    "app_locale_settings_hr.pak",
+    "app_locale_settings_hu.pak",
+    "app_locale_settings_id.pak",
+    "app_locale_settings_it.pak",
+    "app_locale_settings_ja.pak",
+    "app_locale_settings_kn.pak",
+    "app_locale_settings_ko.pak",
+    "app_locale_settings_lt.pak",
+    "app_locale_settings_lv.pak",
+    "app_locale_settings_ml.pak",
+    "app_locale_settings_mr.pak",
+    "app_locale_settings_ms.pak",
+    "app_locale_settings_nl.pak",
+    "app_locale_settings_nb.pak",
+    "app_locale_settings_pl.pak",
+    "app_locale_settings_pt-BR.pak",
+    "app_locale_settings_pt-PT.pak",
+    "app_locale_settings_ro.pak",
+    "app_locale_settings_ru.pak",
+    "app_locale_settings_sk.pak",
+    "app_locale_settings_sl.pak",
+    "app_locale_settings_sr.pak",
+    "app_locale_settings_sv.pak",
+    "app_locale_settings_sw.pak",
+    "app_locale_settings_ta.pak",
+    "app_locale_settings_te.pak",
+    "app_locale_settings_th.pak",
+    "app_locale_settings_tr.pak",
+    "app_locale_settings_uk.pak",
+    "app_locale_settings_vi.pak",
+    "app_locale_settings_zh-CN.pak",
+    "app_locale_settings_zh-TW.pak",
+  ]
 }
diff --git a/webkit/BUILD.gn b/webkit/BUILD.gn
index ca1eae7..fbabc2e 100644
--- a/webkit/BUILD.gn
+++ b/webkit/BUILD.gn
@@ -14,14 +14,82 @@ group("resources") {
 grit("webkit_resources_action") {
   visibility = ":resources"
   source = "glue/resources/webkit_resources.grd"
+  outputs = [
+    "grit/webkit_resources.h",
+    "webkit_resources_100_percent.pak",
+    "webkit_resources_200_percent.pak",
+  ]
 }
 
 grit("blink_common_resources") {
   visibility = ":resources"
   source = "//third_party/WebKit/public/blink_resources.grd"
+  outputs = [
+    "grit/blink_resources.h",
+    "blink_resources.rc",
+    "blink_resources.pak",
+  ]
 }
 
 # webkit_strings in webkit_resources.gyp
 grit("strings") {
   source = "glue/webkit_strings.grd"
+  outputs = [
+    "grit/webkit_strings.h",
+    "webkit_strings_en-US.rc",
+    "webkit_strings_am.pak",
+    "webkit_strings_ar.pak",
+    "webkit_strings_bg.pak",
+    "webkit_strings_bn.pak",
+    "webkit_strings_ca.pak",
+    "webkit_strings_cs.pak",
+    "webkit_strings_da.pak",
+    "webkit_strings_de.pak",
+    "webkit_strings_el.pak",
+    "webkit_strings_en-GB.pak",
+    "webkit_strings_en-US.pak",
+    "webkit_strings_es.pak",
+    "webkit_strings_es-419.pak",
+    "webkit_strings_et.pak",
+    "webkit_strings_fa.pak",
+    "webkit_strings_fake-bidi.pak",
+    "webkit_strings_fi.pak",
+    "webkit_strings_fil.pak",
+    "webkit_strings_fr.pak",
+    "webkit_strings_gu.pak",
+    "webkit_strings_he.pak",
+    "webkit_strings_hi.pak",
+    "webkit_strings_hr.pak",
+    "webkit_strings_hu.pak",
+    "webkit_strings_id.pak",
+    "webkit_strings_it.pak",
+    "webkit_strings_ja.pak",
+    "webkit_strings_kn.pak",
+    "webkit_strings_ko.pak",
+    "webkit_strings_lt.pak",
+    "webkit_strings_lv.pak",
+    "webkit_strings_ml.pak",
+    "webkit_strings_mr.pak",
+    "webkit_strings_ms.pak",
+    "webkit_strings_nl.pak",
+    "webkit_strings_nb.pak",
+    "webkit_strings_pl.pak",
+    "webkit_strings_pt-BR.pak",
+    "webkit_strings_pt-PT.pak",
+    "webkit_strings_ro.pak",
+    "webkit_strings_ru.pak",
+    "webkit_strings_sk.pak",
+    "webkit_strings_sl.pak",
+    "webkit_strings_sr.pak",
+    "webkit_strings_sv.pak",
+    "webkit_strings_sw.pak",
+    "webkit_strings_ta.pak",
+    "webkit_strings_te.pak",
+    "webkit_strings_th.pak",
+    "webkit_strings_tr.pak",
+    "webkit_strings_uk.pak",
+    "webkit_strings_vi.pak",
+    "webkit_strings_zh-CN.pak",
+    "webkit_strings_zh-TW.pak",
+  ]
 }