Patches for v138
This commit is contained in:
@@ -9,11 +9,10 @@ required by the chromium build tools.
|
||||
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/search_engines/BUILD.gn | 4 +++-
|
||||
components/variations/field_trial_config/BUILD.gn | 4 +++-
|
||||
tools/json_to_struct/json_to_struct.gni | 4 +++-
|
||||
tools/metrics/generate_allowlist_from_histograms_file.gni | 5 +++--
|
||||
5 files changed, 17 insertions(+), 7 deletions(-)
|
||||
4 files changed, 14 insertions(+), 6 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
|
||||
@@ -39,27 +38,6 @@ diff --git a/components/metrics/generate_expired_histograms_array.gni b/componen
|
||||
|
||||
if (defined(invoker.namespace) && invoker.namespace != "") {
|
||||
args += [ "-n" + invoker.namespace ]
|
||||
diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
|
||||
--- a/components/search_engines/BUILD.gn
|
||||
+++ b/components/search_engines/BUILD.gn
|
||||
@@ -298,7 +298,7 @@ component("search_engines_switches") {
|
||||
|
||||
if (!is_android) {
|
||||
action("generate_search_engine_icons") {
|
||||
- script = "//tools/search_engine_choice/generate_search_engine_icons.py"
|
||||
+ script = "//build/gn_run_binary.py"
|
||||
|
||||
inputs = [
|
||||
"//tools/search_engine_choice/generate_search_engine_icons_config.json",
|
||||
@@ -315,6 +315,8 @@ if (!is_android) {
|
||||
]
|
||||
|
||||
args = [
|
||||
+ rebase_path("//third_party/depot_tools/vpython3"),
|
||||
+ rebase_path("//tools/search_engine_choice/generate_search_engine_icons.py"),
|
||||
rebase_path("//", root_build_dir),
|
||||
rebase_path("$target_gen_dir/generated_search_engine_resource_ids-inc.cc",
|
||||
root_build_dir),
|
||||
diff --git a/components/variations/field_trial_config/BUILD.gn b/components/variations/field_trial_config/BUILD.gn
|
||||
--- a/components/variations/field_trial_config/BUILD.gn
|
||||
+++ b/components/variations/field_trial_config/BUILD.gn
|
||||
|
||||
Reference in New Issue
Block a user