Merge pull request #13342 from brave/pr13335_fix-brave-resource-ids_1.39.x

Use grit generator properly to generate non-overlapped resource IDs. (uplift to 1.39.x)

Author: kjozwiak

app/BUILD.gn

@@ -1,15 +1,15 @@
 import("//brave/components/brave_vpn/buildflags/buildflags.gni")
 import("//brave/components/sidebar/buildflags/buildflags.gni")
 import("//brave/components/speedreader/buildflags.gni")
+import("//brave/resources/brave_grit.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
-import("//tools/grit/grit_rule.gni")
 
 source_set("command_ids") {
   sources = [ "brave_command_ids.h" ]
 }
 
-grit("brave_generated_resources_grit") {
+brave_grit("brave_generated_resources_grit") {
   defines = [
     "enable_sidebar=$enable_sidebar",
     "enable_speedreader=$enable_speedreader",
@@ -27,13 +27,6 @@ grit("brave_generated_resources_grit") {
   foreach(locale, all_chrome_locales) {
     outputs += [ "brave_generated_resources_$locale.pak" ]
   }
-
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-  ]
-
-  resource_ids = "//brave/browser/resources/resource_ids"
 }
 
 group("app") {

app/theme/BUILD.gn

@@ -1,9 +1,9 @@
 import("//brave/components/ipfs/buildflags/buildflags.gni")
 import("//brave/components/sidebar/buildflags/buildflags.gni")
+import("//brave/resources/brave_grit.gni")
 import("//chrome/common/features.gni")
-import("//tools/grit/grit_rule.gni")
 
-grit("brave_theme_resources") {
+brave_grit("brave_theme_resources") {
   source = "brave_theme_resources.grd"
   defines = chrome_grit_defines
   defines += [
@@ -19,20 +19,16 @@ grit("brave_theme_resources") {
     "brave_theme_resources_300_percent.pak",
   ]
 
-  resource_ids = "//brave/browser/resources/resource_ids"
-
   output_dir = "$root_gen_dir/brave"
 }
 
-grit("brave_unscaled_resources") {
+brave_grit("brave_unscaled_resources") {
   source = "brave_unscaled_resources.grd"
   defines = chrome_grit_defines
   outputs = [
     "grit/brave_unscaled_resources.h",
     "brave_unscaled_resources.pak",
   ]
 
-  resource_ids = "//brave/browser/resources/resource_ids"
-
   output_dir = "$root_gen_dir/brave"
 }

browser/resources/bookmarks/BUILD.gn

@@ -3,30 +3,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # you can obtain one at http://mozilla.org/MPL/2.0/.
 
+import("//brave/resources/brave_grit.gni")
 import("//chrome/common/features.gni")
-import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "brave_preprocessed_manifest.json"
 
-grit("resources") {
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    "-E",
-    "root_src_dir=" + rebase_path("//", root_build_dir),
-  ]
-
+brave_grit("resources") {
   defines = chrome_grit_defines
 
   enable_input_discovery_for_gn_analyze = false
-  defines +=
-      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
-  bookmarks_gen_dir = "$root_gen_dir/brave/browser/resources/bookmarks"
-  source = "$bookmarks_gen_dir/brave_bookmarks_resources.grd"
+  source = "$target_gen_dir/brave_bookmarks_resources.grd"
   deps = [ ":build_grd" ]
 
   outputs = [
@@ -35,9 +25,6 @@ grit("resources") {
     "grit/brave_bookmarks_resources_map.h",
     "brave_bookmarks_resources.pak",
   ]
-
-  output_dir = "$root_gen_dir/brave/browser/resources/bookmarks"
-  resource_ids = "//brave/browser/resources/resource_ids"
 }
 
 generate_grd("build_grd") {

browser/resources/extensions/BUILD.gn

@@ -1,6 +1,6 @@
+import("//brave/resources/brave_grit.gni")
 import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//chrome/common/features.gni")
-import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
@@ -9,21 +9,11 @@ preprocess_folder = "preprocessed"
 preprocess_manifest = "brave_preprocessed_manifest.json"
 preprocess_gen_manifest = "brave_preprocessed_gen_manifest.json"
 
-grit("resources") {
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    "-E",
-    "root_src_dir=" + rebase_path("//", root_build_dir),
-  ]
-
+brave_grit("resources") {
   defines = chrome_grit_defines
 
   enable_input_discovery_for_gn_analyze = false
-  defines +=
-      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
-  extensions_gen_dir = "$root_gen_dir/brave/browser/resources/extensions"
-  source = "$extensions_gen_dir/brave_extensions_resources.grd"
+  source = "$target_gen_dir/brave_extensions_resources.grd"
   deps = [ ":build_grd" ]
 
   outputs = [
@@ -32,9 +22,6 @@ grit("resources") {
     "grit/brave_extensions_resources_map.h",
     "brave_extensions_resources.pak",
   ]
-
-  output_dir = "$root_gen_dir/brave/browser/resources/extensions"
-  resource_ids = "//brave/browser/resources/resource_ids"
 }
 
 generate_grd("build_grd") {

browser/resources/federated_internals/BUILD.gn

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//brave/resources/brave_grit.gni")
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("//ui/webui/webui_features.gni")
@@ -15,7 +15,7 @@ preprocess_mojo_manifest = "preprocessed_mojo_manifest.json"
 
 generate_grd("build_grd") {
   grd_prefix = "federated_internals"
-  out_grd = "$target_gen_dir/federated_internals_resources.grd"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
   input_files = [
     "federated_internals.html",
     "federated_internals.css",
@@ -37,12 +37,9 @@ preprocess_if_expr("preprocess_mojo") {
   in_files = [ "federated_internals.mojom-webui.js" ]
 }
 
-grit("resources") {
+brave_grit("resources") {
   defines = chrome_grit_defines
-  defines +=
-      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
 
-  # These arguments are needed since the grd is generated at build time.
   enable_input_discovery_for_gn_analyze = false
   source = "$target_gen_dir/federated_internals_resources.grd"
   deps = [ ":build_grd" ]
@@ -53,9 +50,6 @@ grit("resources") {
     "grit/federated_internals_resources_map.h",
     "federated_internals_resources.pak",
   ]
-
-  output_dir = "$root_gen_dir/brave/browser/resources/federated_internals"
-  resource_ids = "//brave/browser/resources/resource_ids"
 }
 
 js_type_check("closure_compile") {

browser/resources/history/BUILD.gn

@@ -3,30 +3,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # you can obtain one at http://mozilla.org/MPL/2.0/.
 
+import("//brave/resources/brave_grit.gni")
 import("//chrome/common/features.gni")
-import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "brave_preprocessed_manifest.json"
 
-grit("resources") {
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    "-E",
-    "root_src_dir=" + rebase_path("//", root_build_dir),
-  ]
-
+brave_grit("resources") {
   defines = chrome_grit_defines
 
   enable_input_discovery_for_gn_analyze = false
-  defines +=
-      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
-  history_gen_dir = "$root_gen_dir/brave/browser/resources/history"
-  source = "$history_gen_dir/brave_history_resources.grd"
+  source = "$target_gen_dir/brave_history_resources.grd"
   deps = [ ":build_grd" ]
 
   outputs = [
@@ -35,9 +25,6 @@ grit("resources") {
     "grit/brave_history_resources_map.h",
     "brave_history_resources.pak",
   ]
-
-  output_dir = "$root_gen_dir/brave/browser/resources/history"
-  resource_ids = "//brave/browser/resources/resource_ids"
 }
 
 generate_grd("build_grd") {