Update monet.

build/secondary/tools/grit/grit_rule.gni

 # 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.
 
 # Instantiate grit. This will produce a script target to run grit, and a
 # static library that compiles the .cc files.
 #
 # Parameters
 #
 #   source (required)
@@ skipping 89 matching lines @@
   ]
 } else {
   grit_defines += [
     "-D",
     "_chromium",
     "-E",
     "CHROMIUM_BUILD=chromium",
   ]
 }
 
-if (is_chromeos) {
-  grit_defines += [
-    "-D",
-    "chromeos",
-    "-D",
-    "scale_factors=2x",
-  ]
-}
-
 if (is_desktop_linux) {
   grit_defines += [
     "-D",
     "desktop_linux",
   ]
 }
 
-if (toolkit_views) {
-  grit_defines += [
-    "-D",
-    "toolkit_views",
-  ]
-}
-
-if (use_aura) {
-  grit_defines += [
-    "-D",
-    "use_aura",
-  ]
-}
-
-if (use_ash) {
-  grit_defines += [
-    "-D",
-    "use_ash",
-  ]
-}
-
 if (use_nss_certs) {
   grit_defines += [
     "-D",
     "use_nss_certs",
   ]
 }
 
 if (use_ozone) {
   grit_defines += [
     "-D",
     "use_ozone",
   ]
 }
 
-if (enable_image_loader_extension) {
-  grit_defines += [
-    "-D",
-    "image_loader_extension",
-  ]
-}
-
-if (enable_remoting) {
-  grit_defines += [
-    "-D",
-    "remoting",
-  ]
-}
-
 if (is_android) {
   grit_defines += [
     "-t",
     "android",
     "-E",
     "ANDROID_JAVA_TAGGED_ONLY=true",
   ]
 }
 
 if (is_mac || is_ios) {
   grit_defines += [
     "-D",
     "scale_factors=2x",
   ]
 }
 
 if (is_ios) {
   grit_defines += [
     "-t",
     "ios",
 
     # iOS uses a whitelist to filter resources.
     "-w",
     rebase_path("//build/ios/grit_whitelist.txt", root_build_dir),
   ]
 }
 
-if (enable_extensions) {
-  grit_defines += [
-    "-D",
-    "enable_extensions",
-  ]
-}
-if (enable_media_router) {
-  grit_defines += [
-    "-D",
-    "enable_media_router",
-  ]
-}
-if (enable_plugins) {
-  grit_defines += [
-    "-D",
-    "enable_plugins",
-  ]
-}
-if (enable_basic_printing || enable_print_preview) {
-  grit_defines += [
-    "-D",
-    "enable_printing",
-  ]
-  if (enable_print_preview) {
-    grit_defines += [
-      "-D",
-      "enable_print_preview",
-    ]
-  }
-}
-if (enable_themes) {
-  grit_defines += [
-    "-D",
-    "enable_themes",
-  ]
-}
-if (enable_app_list) {
-  grit_defines += [
-    "-D",
-    "enable_app_list",
-  ]
-}
-if (enable_settings_app) {
-  grit_defines += [
-    "-D",
-    "enable_settings_app",
-  ]
-}
-if (enable_google_now) {
-  grit_defines += [
-    "-D",
-    "enable_google_now",
-  ]
-}
-
-# Note: use_concatenated_impulse_responses is omitted. It is never used and
-# should probably be removed from GYP build.
-if (enable_webrtc) {
-  grit_defines += [
-    "-D",
-    "enable_webrtc",
-  ]
-}
-if (enable_hangout_services_extension) {
-  grit_defines += [
-    "-D",
-    "enable_hangout_services_extension",
-  ]
-}
-if (enable_task_manager) {
-  grit_defines += [
-    "-D",
-    "enable_task_manager",
-  ]
-}
-if (enable_notifications) {
-  grit_defines += [
-    "-D",
-    "enable_notifications",
-  ]
-}
-if (enable_wifi_bootstrapping) {
-  grit_defines += [
-    "-D",
-    "enable_wifi_bootstrapping",
-  ]
-}
-if (enable_service_discovery) {
-  grit_defines += [
-    "-D",
-    "enable_service_discovery",
-  ]
-}
-if (mac_views_browser) {
-  grit_defines += [
-    "-D",
-    "mac_views_browser",
-  ]
-}
-
 grit_resource_id_file = "//tools/gritsettings/resource_ids"
 grit_info_script = "//tools/grit/grit_info.py"
 
 template("grit") {
   assert(defined(invoker.source),
          "\"source\" must be defined for the grit template $target_name")
 
   grit_inputs = [ invoker.source ]
 
   if (defined(invoker.resource_ids)) {
     resource_ids = invoker.resource_ids
   } else {
     resource_ids = grit_resource_id_file
   }
-  grit_inputs += [ resource_ids ]  # Script depends on ID file.
+  if (resource_ids != "") {
+    # The script depends on the ID file. Only add this dependency if the ID
+    # file is specified.
+    grit_inputs += [ resource_ids ]
+  }
 
   if (defined(invoker.output_dir)) {
     output_dir = invoker.output_dir
   } else {
     output_dir = target_gen_dir
   }
 
   if (defined(invoker.output_name)) {
     grit_output_name = invoker.output_name
   } else {
@@ skipping 111 matching lines @@
     }
   }
 
   # This is the thing that people actually link with, it must be named the
   # same as the argument the template was invoked with.
   source_set(target_name) {
     # Since we generate a file, we need to be run before the targets that
     # depend on us.
     sources = grit_outputs
 
-    # Deps set on the template invocation will go on the grit script running
-    # target rather than this library.
-    deps = [
+    # Deps set on the template invocation will go on the action that runs
+    # grit above rather than this library. This target needs to depend on the
+    # action publicly so other scripts can take the outputs from the grit
+    # script as inputs.
+    public_deps = [
       ":$grit_custom_target",
     ]
     public_configs = [ ":$grit_config" ]
 
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
 
     if (defined(invoker.configs)) {
       configs += invoker.configs
     }
 
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     output_name = grit_output_name
   }
 }