Commit 133b5647 authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[GRIT] Fix resource_ids oddity.

resource_ids seems to have been corruped in

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

and causes update_resource_ids to fail. This CL manually fixes the
problem, then calls update_resource_ids to update numeric ranges.

Change-Id: I45fd22dd8da5117c33f76a5a6c451af7f35dfd8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954880Reviewed-by: default avatarSamuel Huang <huangs@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Auto-Submit: Samuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722478}
parent 6fef434b
...@@ -172,21 +172,21 @@ ...@@ -172,21 +172,21 @@
"structures": [10690], "structures": [10690],
}, },
"chrome/browser/resources/settings/settings_resources_vulcanized.grd": { "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
"includes": [11230], "includes": [11240],
}, },
"chrome/browser/resources/settings/settings_resources.grd": { "chrome/browser/resources/settings/settings_resources.grd": {
"structures": [11240], "structures": [11250],
}, },
"chrome/browser/resources/tab_strip/tab_strip_resources.grd": { "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
"structures": [11830], "structures": [11850],
"includes": [11850], "includes": [11870],
}, },
"chrome/browser/resources/welcome/welcome_resources.grd": { "chrome/browser/resources/welcome/welcome_resources.grd": {
"includes": [11870], "includes": [11890],
"structures": [11900], "structures": [11920],
}, },
"chrome/browser/vr/testapp/vr_testapp_resources.grd": { "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
"includes": [11920], "includes": [11940],
}, },
# END chrome/browser section. # END chrome/browser section.
...@@ -319,22 +319,22 @@ ...@@ -319,22 +319,22 @@
"messages": [12840], "messages": [12840],
}, },
"components/omnibox/resources/omnibox_resources.grd": { "components/omnibox/resources/omnibox_resources.grd": {
"includes": [14770], "includes": [14760],
}, },
"components/policy/resources/policy_templates.grd": { "components/policy/resources/policy_templates.grd": {
"structures": [14780], "structures": [14770],
}, },
"components/resources/components_resources.grd": { "components/resources/components_resources.grd": {
"includes": [14790], "includes": [14780],
}, },
"components/resources/components_scaled_resources.grd": { "components/resources/components_scaled_resources.grd": {
"structures": [14870], "structures": [14860],
}, },
"components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd": { "components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd": {
"messages": [14910], "messages": [14900],
}, },
"components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
"includes": [14930] "includes": [14920]
}, },
# END components/ section. # END components/ section.
...@@ -460,114 +460,114 @@ ...@@ -460,114 +460,114 @@
}, },
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": { "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
"includes": [16230], "includes": [16330],
"messages": [16235], "messages": [16340],
}, },
"device/bluetooth/bluetooth_strings.grd": { "device/bluetooth/bluetooth_strings.grd": {
"messages": [16240], "messages": [16350],
}, },
"device/fido/fido_strings.grd": { "device/fido/fido_strings.grd": {
"messages": [16275], "messages": [16390],
}, },
"extensions/browser/resources/extensions_browser_resources.grd": { "extensions/browser/resources/extensions_browser_resources.grd": {
"structures": [16380], "structures": [16400],
}, },
"extensions/extensions_resources.grd": { "extensions/extensions_resources.grd": {
"includes": [16390], "includes": [16410],
}, },
"extensions/renderer/resources/extensions_renderer_resources.grd": { "extensions/renderer/resources/extensions_renderer_resources.grd": {
"includes": [16400], "includes": [16420],
"structures": [16470], "structures": [16490],
}, },
"extensions/shell/app_shell_resources.grd": { "extensions/shell/app_shell_resources.grd": {
"includes": [16480], "includes": [16500],
}, },
"extensions/strings/extensions_strings.grd": { "extensions/strings/extensions_strings.grd": {
"messages": [16490], "messages": [16510],
}, },
"headless/lib/resources/headless_lib_resources.grd": { "headless/lib/resources/headless_lib_resources.grd": {
"includes": [16570], "includes": [16590],
}, },
"mojo/public/js/mojo_bindings_resources.grd": { "mojo/public/js/mojo_bindings_resources.grd": {
"includes": [16580], "includes": [16600],
}, },
"net/base/net_resources.grd": { "net/base/net_resources.grd": {
"includes": [16600], "includes": [16620],
}, },
"remoting/resources/remoting_strings.grd": { "remoting/resources/remoting_strings.grd": {
"messages": [16610], "messages": [16630],
}, },
"services/services_strings.grd": { "services/services_strings.grd": {
"messages": [16990], "messages": [17010],
}, },
"third_party/blink/public/blink_image_resources.grd": { "third_party/blink/public/blink_image_resources.grd": {
"structures": [17000], "structures": [17020],
}, },
"third_party/blink/public/blink_resources.grd": { "third_party/blink/public/blink_resources.grd": {
"includes": [17010], "includes": [17030],
}, },
"third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd": { "third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd": {
"includes": [17090], "includes": [17110],
"structures": [17100], "structures": [17120],
}, },
"third_party/blink/public/strings/blink_strings.grd": { "third_party/blink/public/strings/blink_strings.grd": {
"messages": [17110], "messages": [17130],
}, },
"third_party/ink/ink_resources.grd": { "third_party/ink/ink_resources.grd": {
"includes": [17420], "includes": [17440],
}, },
"third_party/libaddressinput/chromium/address_input_strings.grd": { "third_party/libaddressinput/chromium/address_input_strings.grd": {
"messages": [17430], "messages": [17450],
}, },
"ui/base/test/ui_base_test_resources.grd": { "ui/base/test/ui_base_test_resources.grd": {
"messages": [17480], "messages": [17500],
}, },
"ui/chromeos/resources/ui_chromeos_resources.grd": { "ui/chromeos/resources/ui_chromeos_resources.grd": {
"structures": [17490], "structures": [17510],
}, },
"ui/chromeos/ui_chromeos_strings.grd": { "ui/chromeos/ui_chromeos_strings.grd": {
"messages": [17590], "messages": [17610],
}, },
"ui/file_manager/file_manager_resources.grd": { "ui/file_manager/file_manager_resources.grd": {
"includes": [18510], "includes": [18530],
}, },
"ui/resources/ui_resources.grd": { "ui/resources/ui_resources.grd": {
"structures": [18730], "structures": [18750],
}, },
"ui/resources/ui_unscaled_resources.grd": { "ui/resources/ui_unscaled_resources.grd": {
"includes": [18870], "includes": [18890],
}, },
"ui/strings/app_locale_settings.grd": { "ui/strings/app_locale_settings.grd": {
"messages": [18900], "messages": [18920],
}, },
"ui/strings/ui_strings.grd": { "ui/strings/ui_strings.grd": {
"messages": [18910], "messages": [18930],
}, },
"ui/views/resources/views_resources.grd": { "ui/views/resources/views_resources.grd": {
"structures": [19210], "structures": [19230],
}, },
"ui/webui/resources/webui_resources.grd": { "ui/webui/resources/webui_resources.grd": {
"includes": [19270], "includes": [19290],
"structures": [19430], "structures": [19450],
}, },
"weblayer/weblayer_resources.grd": { "weblayer/weblayer_resources.grd": {
"includes": [20050], "includes": [20070],
}, },
# This file is generated during the build. # This file is generated during the build.
"<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": { "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
"META": {"sizes": {"includes": [500],}}, "META": {"sizes": {"includes": [500],}},
"includes": [20060], "includes": [20080],
}, },
# END "everything else" section. # END "everything else" 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