Patches for 138 (final)

build/patches/Force-use-vpython3-for-some-scripts.patch

@@ -10,9 +10,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  components/metrics/generate_expired_histograms_array.gni  | 7 +++++--
  components/variations/field_trial_config/BUILD.gn         | 4 +++-
+ tools/grit/grit_rule.gni                                  | 4 +++-
  tools/json_to_struct/json_to_struct.gni                   | 4 +++-
  tools/metrics/generate_allowlist_from_histograms_file.gni | 5 +++--
- 4 files changed, 14 insertions(+), 6 deletions(-)
+ 5 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/components/metrics/generate_expired_histograms_array.gni b/components/metrics/generate_expired_histograms_array.gni
 --- a/components/metrics/generate_expired_histograms_array.gni
@@ -59,6 +60,27 @@ diff --git a/components/variations/field_trial_config/BUILD.gn b/components/vari
      rebase_path(source, root_build_dir),
      "--destbase=" + rebase_path(target_gen_dir, root_build_dir),
      "--namespace=variations",
+diff --git a/tools/grit/grit_rule.gni b/tools/grit/grit_rule.gni
+--- a/tools/grit/grit_rule.gni
++++ b/tools/grit/grit_rule.gni
+@@ -154,7 +154,7 @@ template("grit") {
+ 
+   _grit_custom_target = target_name + "_grit"
+   action(_grit_custom_target) {
+-    script = "//tools/grit/grit.py"
++    script = "//build/gn_run_binary.py"
+     inputs = [ invoker.source ]
+ 
+     testonly = defined(invoker.testonly) && invoker.testonly
+@@ -197,6 +197,8 @@ template("grit") {
+     }
+ 
+     args = [
++            rebase_path("//third_party/depot_tools/vpython3"),
++            rebase_path("//tools/grit/grit.py"),
+              "-i",
+              _rebased_source_path,
+              "build",
 diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json_to_struct.gni
 --- a/tools/json_to_struct/json_to_struct.gni
 +++ b/tools/json_to_struct/json_to_struct.gni