Overlaying upstream's chromeos IDs range alone doesn't work any more and pushes IDs above the 2^16-1 range. This change adds a pre-processing step to upstream's "default_resource_ids" action in //tools/gritsettings/BUILD.gn. The pre-processing filters out all items in tools/gritsettings/resource_ids.spec that have chromeos, ash, or glic in the path. This reduces the ID range taken by the upstream down to, currently, under 51,000. With Brave IDs moved to start at 53,000, they now end under 59,000.
13 lines
634 B
Diff
13 lines
634 B
Diff
diff --git a/tools/gritsettings/BUILD.gn b/tools/gritsettings/BUILD.gn
|
|
index c38ea0efb4474dae38b9d3a3a364aa816a9d5d70..f58ac2cc08765c0a146f7e86beba8476ad65a294 100644
|
|
--- a/tools/gritsettings/BUILD.gn
|
|
+++ b/tools/gritsettings/BUILD.gn
|
|
@@ -12,6 +12,7 @@ action("default_resource_ids") {
|
|
deps = [ "//tools/grit:grit_sources" ]
|
|
depfile = "$target_gen_dir/$target_name.d"
|
|
_rebased_input = rebase_path(inputs[0], root_build_dir)
|
|
+ import("//brave/tools/gritsettings/filter_resource_ids.gni") deps += brave_tools_gritsettings_deps _rebased_input = filtered_resource_id_file_path
|
|
args = [
|
|
"update_resource_ids",
|
|
"-o",
|