Pull buildtools to get GN r282653

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
@@ skipping 169 matching lines @@
   # the current one.
   grit_inputs = rebase_path(grit_inputs_build_rel, ".", root_build_dir) + [
     grit_resource_id_file,
   ]
 
   grit_outputs_build_rel = exec_script(grit_info_script,
     [ "--outputs", "$output_dir", source_path, "-f", resource_ids ] +
     grit_flags,
     "list lines")
 
-  # The inputs are relative to the current (build) directory, rebase to
-  # the current one.
-  grit_outputs = rebase_path(grit_outputs_build_rel, ".", root_build_dir)
+  # 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")
 
   # 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
   # overwritten inside the innter classes so we need to compute it here.
   target_visibility = ":$target_name"
 
   # The current grit setup makes an file in $target_gen_dir/grit/foo.h that
   # the source code expects to include via "grit/foo.h". It would be nice to
   # change this to including absolute paths relative to the root gen directory
   # (like "mycomponent/foo.h"). This config sets up the include path.
@@ skipping 35 matching lines @@
     direct_dependent_configs = [ ":$grit_config" ]
 
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.output_name)) {
       output_name = invoker.output_name
     }
   }
 }