Claudio DeSouza
30448ff354
Chromium changes: https://chromium.googlesource.com/chromium/src/+/e094c24068c0bba807263d048b96e10551ff5f69 commit e094c24068c0bba807263d048b96e10551ff5f69 Author: Andrew Grieve <agrieve@chromium.org> Date: Thu Aug 7 10:49:05 2025 -0700 Grit: Do not leave any gaps when assigning IDs to .grd files We hit the int16 limit, so need more space. This brings the max id of cros from 65430 -> 55790 (according to gen/tools/gritsettings/default_resource_ids) Bug: 436892657 Change-Id: I0aa1017d63bd2f2ec76278cdbd97ee4a877817e4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6826230 Commit-Queue: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Samuel Huang <huangs@chromium.org> Auto-Submit: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#1498349}
14 lines
824 B
Diff
14 lines
824 B
Diff
diff --git a/tools/grit/grit/tool/update_resource_ids/assigner.py b/tools/grit/grit/tool/update_resource_ids/assigner.py
|
|
index 659302677414c4d0b5d75d8f1bddac596a9714e2..a3c5a7662b5f30263f82867b1c22bfea83123d0d 100644
|
|
--- a/tools/grit/grit/tool/update_resource_ids/assigner.py
|
|
+++ b/tools/grit/grit/tool/update_resource_ids/assigner.py
|
|
@@ -277,7 +277,7 @@ def GenerateNewIds(item_list, use_naive):
|
|
"""
|
|
Assigner = NaiveCoarseIdAssigner if use_naive else DagCoarseIdAssigner
|
|
coarse_id_assigner = Assigner(item_list, 10)
|
|
- quota_assigner = QuotaAssigner(Aligner())
|
|
+ quota_assigner = QuotaAssigner(Aligner(expand=1.15, slack=3, align=10))
|
|
for item, start_id in coarse_id_assigner.GenStartIds(): # Topo-sorted.
|
|
cur_id = start_id
|
|
for tag, next_id in quota_assigner.Gen(item, start_id): # Sorted by |lo|.
|