Uplift of #7599 (squashed) to beta

browser/resources/extensions/sources.gni

@@ -0,0 +1,9 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+brave_deps_chrome_browser_resources_extensions_build = [
+  "//brave/browser/resources/extensions:preprocess",
+  "//brave/browser/resources/extensions:preprocess_generated",
+]

browser/resources/settings/sources.gni

@@ -0,0 +1,9 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+brave_deps_chrome_browser_resources_settings_build = [
+  "//brave/browser/resources/settings:preprocess",
+  "//brave/browser/resources/settings:preprocess_generated",
+]

build/config/brave_build.gni

@@ -16,3 +16,5 @@ import("//brave/installer/linux/sources.gni")
 import("//brave/net/sources.gni")
 import("//brave/renderer/sources.gni")
 import("//brave/third_party/blink/renderer/includes.gni")
+import("//brave/browser/resources/settings/sources.gni")
+import("//brave/browser/resources/extensions/sources.gni")

patches/chrome-browser-resources-extensions-BUILD.gn.patch

@@ -1,8 +1,16 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index cfed148d68be8d0880823b391b55936f942c22cc..2b2989f4ce45b6b74d25d3537865d7d09c54c19e 100644
+index cfed148d68be8d0880823b391b55936f942c22cc..13eaf87e24b8203739cf5c51d4d0356f5052384e 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
-@@ -57,6 +57,7 @@ generate_grd("build_grd") {
+@@ -30,6 +30,7 @@ if (optimize_webui) {
+       "../../../../ui/webui/resources:preprocess",
+     ]
+     excludes = [ "chrome://resources/js/cr.m.js" ]
++    deps += brave_deps_chrome_browser_resources_extensions_build
+   }
+ }
+
+@@ -57,6 +58,7 @@ generate_grd("build_grd") {
        "$target_gen_dir/$preprocess_gen_manifest",
      ]
    }

patches/chrome-browser-resources-settings-BUILD.gn.patch

@@ -1,8 +1,16 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 11a8c2b06277288e35925866e6a7387d59c6faca..952034904b01f5b9bfbfbf99a76a8729b8ad1bf3 100644
+index 11a8c2b06277288e35925866e6a7387d59c6faca..da377b2814de59a790a313a10a2969b62ad31af4 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -85,6 +85,7 @@ generate_grd("build_grd") {
+@@ -45,6 +45,7 @@ if (optimize_webui) {
+       "chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js",
+       "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-lite.js",
+     ]
++    deps += brave_deps_chrome_browser_resources_settings_build
+   }
+ }
+
+@@ -85,6 +86,7 @@ generate_grd("build_grd") {
        "$target_gen_dir/$preprocess_gen_manifest",
      ]
    }