Commit fa0f6b7d authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[GRIT] Fix resource_ids for sample_system_web_app_resources.grd.

This CL fixes resource_ids entry sample_system_web_app_resources.grd,
which was added in:

https://chromium-review.googlesource.com/c/chromium/src/+/1956978

The new GRD (B) displaced an entry (C) that has META "join" for mutually
exclusive entries (A1 and A2). This causes the following sub-graph
change:

  A1 <-- C     ===>    A1 <-------- C
  A2 <---+             A2 <-- B <---+

This caused A1 to collide with B when GRIT update_resource_ids runs. The
problem was mitigated in

https://chromium-review.googlesource.com/c/chromium/src/+/1980336

by swapping A1 and A2. However, the proper fix (implemented by this CL)
is to move META "join" from C to B, so the sub-graph becomes:

  A1 <-- B <--- C
  A2 <---+

This CL also reserves more ID space for media_app_bundle_resources.grd
(A1) to accommodate potential growth.

Change-Id: I891b643192ef49699397b8376e4fec03e66f2f49
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980802Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727198}
parent 14392c50
...@@ -181,15 +181,15 @@ ...@@ -181,15 +181,15 @@
"structures": [11170], "structures": [11170],
}, },
"chrome/browser/resources/tab_strip/tab_strip_resources.grd": { "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
"structures": [11610], "structures": [11620],
"includes": [11630], "includes": [11640],
}, },
"chrome/browser/resources/welcome/welcome_resources.grd": { "chrome/browser/resources/welcome/welcome_resources.grd": {
"includes": [11650], "includes": [11660],
"structures": [11680], "structures": [11690],
}, },
"chrome/browser/vr/testapp/vr_testapp_resources.grd": { "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
"includes": [11700], "includes": [11710],
}, },
# END chrome/browser section. # END chrome/browser section.
...@@ -287,19 +287,19 @@ ...@@ -287,19 +287,19 @@
# start with the same id because only one of them is built depending on if # start with the same id because only one of them is built depending on if
# src_internal is available. Lower bound for number of resource ids is number # src_internal is available. Lower bound for number of resource ids is number
# of languages (74). # of languages (74).
"chromeos/components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd": { "chromeos/components/media_app_ui/resources/app/app/media_app_bundle_resources.grd": {
"META": {"sizes": {"includes": [120],}}, # Relies on src-internal.
"includes": [12390], "includes": [12390],
}, },
"chromeos/components/media_app_ui/resources/app/app/media_app_bundle_resources.grd": { "chromeos/components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd": {
"META": {"sizes": {"includes": [100],}}, # Relies on src-internal.
"includes": [12390], "includes": [12390],
}, },
"chromeos/components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd": { "chromeos/components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd": {
"includes": [12510], "META": {"join": 2},
"includes": [12530],
}, },
"chromeos/resources/chromeos_resources.grd": { "chromeos/resources/chromeos_resources.grd": {
"META": {"join": 2}, "includes": [12540],
"includes": [12520],
}, },
# END chromeos/ section. # END chromeos/ section.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment