Move Brave strings to different number range

We previously stored Brave's strings after all of Chromium's resource strings. This presents two problems, however: 1 - Every time new strings are added to Chrome in such a way that they conflict with our strings, we need to increment our base. 2 - We are rapidly running out of room at the upper end of the range, as pak files only support identifiers up to 65536. In order to deal with this, I've moved Brave's strings to a section of the Chromium identifiers that's reserved for ChromiumOS/Ash which we don't use.
brave · Oct 25, 2024 · 6c56efb · 6c56efb
1 parent 8fd87a3
commit 6c56efb
Showing 1 changed file with 52 additions and 52 deletions.
diff --git a/resources/resource_ids.spec b/resources/resource_ids.spec
@@ -4,221 +4,221 @@
 {
   "SRCDIR": "../..",
   "brave/common/extensions/api/brave_api_resources.grd": {
-    "includes": [59580],
+    "includes": [29580],
   },
   "brave/components/resources/brave_components_resources.grd": {
-    "includes": [59600],
+    "includes": [29600],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_adblock/brave_adblock.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [59670],
+    "includes": [29670],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_new_tab/brave_new_tab.grd": {
     "META": {"sizes": {"includes": [50]}},
-    "includes": [59680],
+    "includes": [29680],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_welcome/brave_welcome.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [59730],
+    "includes": [29730],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/browser/resources/settings/brave_settings_resources.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [59750],
+    "includes": [29750],
   },
   "brave/app/brave_generated_resources.grd": {
-    "includes": [59770],
-    "messages": [59780],
+    "includes": [29770],
+    "messages": [29780],
   },
   "brave/app/theme/brave_theme_resources.grd": {
-    "structures": [60200],
+    "structures": [30200],
   },
   "brave/app/theme/brave_unscaled_resources.grd": {
-    "includes": [60300],
+    "includes": [30300],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_webtorrent/brave_webtorrent.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [60310],
+    "includes": [30310],
   },
   "brave/components/brave_webtorrent/resources.grd": {
-    "includes": [60320],
+    "includes": [30320],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_rewards_panel/brave_rewards_panel.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [60330],
+    "includes": [30330],
   },
   "brave/components/brave_rewards/resources/brave_rewards_static_resources.grd": {
-    "includes": [60350],
+    "includes": [30350],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_rewards_page/brave_rewards_page.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [60360],
+    "includes": [30360],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_rewards_internals/brave_rewards_internals.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [60380],
+    "includes": [30380],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_rewards_tip/brave_rewards_tip.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [60390],
+    "includes": [30390],
   },
   "brave/components/resources/brave_components_strings.grd": {
-    "messages": [60410],
+    "messages": [30410],
   },
   "brave/components/brave_ads/resources/bat_ads_resources.grd": {
-    "includes": [63500]
+    "includes": [33500]
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_page/brave_wallet_page.grd": {
     "META": {"sizes": {"includes": [200]}},
-    "includes": [63510],
+    "includes": [33510],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-ethereum_remote_client_page/ethereum_remote_client_page.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63710],
+    "includes": [33710],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_panel/brave_wallet_panel.grd": {
     "META": {"sizes": {"includes": [200]}},
-    "includes": [63720],
+    "includes": [33720],
   },
   "brave/components/brave_extension/extension/resources.grd": {
-    "includes": [63920],
+    "includes": [33920],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_extension/brave_extension.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63940],
+    "includes": [33940],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-webcompat_reporter/webcompat_reporter.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63950],
+    "includes": [33950],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-cosmetic_filters/cosmetic_filters.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63960],
+    "includes": [33960],
   },
   "brave/components/tor/resources/tor_static_resources.grd": {
-    "includes": [63970],
+    "includes": [33970],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-tor_internals/tor_internals.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63980],
+    "includes": [33980],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_script/brave_wallet_script.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [63990],
+    "includes": [33990],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_vpn_panel/brave_vpn_panel.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64000],
+    "includes": [34000],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_shields_panel/brave_shields_panel.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64010],
+    "includes": [34010],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-trezor_bridge/trezor_bridge.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64020],
+    "includes": [34020],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-market_display/market_display.grd": {
     "META": {"sizes": {"includes": [50]}},
-    "includes": [64030],
+    "includes": [34030],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_private_new_tab/brave_private_new_tab.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64080],
+    "includes": [34080],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-playlist/playlist.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64090],
+    "includes": [34090],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-ledger_bridge/ledger_bridge.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64100],
+    "includes": [34100],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-nft_display/nft_display.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64110],
+    "includes": [34110],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-cookie_list_opt_in/cookie_list_opt_in.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64120],
+    "includes": [34120],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_speedreader_toolbar/brave_speedreader_toolbar.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64130],
+    "includes": [34130],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_adblock_internals/brave_adblock_internals.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64140],
+    "includes": [34140],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-commands/commands.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64150],
+    "includes": [34150],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_swap_page/brave_wallet_swap_page.grd": {
     "META": {"sizes": {"includes": [100]}},
-    "includes": [64250],
+    "includes": [34250],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_send_page/brave_wallet_send_page.grd": {
     "META": {"sizes": {"includes": [50]}},
-    "includes": [64300],
+    "includes": [34300],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_deposit_page/brave_wallet_deposit_page.grd": {
     "META": {"sizes": {"includes": [100]}},
-    "includes": [64400],
+    "includes": [34400],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_fund_wallet_page/brave_wallet_fund_wallet_page.grd": {
     "META": {"sizes": {"includes": [80]}},
-    "includes": [64500],
+    "includes": [34500],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-tip_panel/tip_panel.grd": {
     "META": {"sizes": {"includes": [20]}},
-    "includes": [64580]
+    "includes": [34580]
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-ai_chat_ui/ai_chat_ui.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64600],
+    "includes": [34600],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-skus_internals/skus_internals.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64610],
+    "includes": [34610],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_news_internals/brave_news_internals.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64620],
+    "includes": [34620],
   },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-line_chart_display/line_chart_display.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64630]
+    "includes": [34630]
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-ai_rewriter_ui/ai_rewriter_ui.grd": {
     "META": {"sizes": {"includes": [10]}},
-    "includes": [64640],
+    "includes": [34640],
   },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-rewards_page/rewards_page.grd": {
     "META": {"sizes": {"includes": [50]}},
-    "includes": [64650],
+    "includes": [34650],
   },
 }