Merge pull request #2160 from brave/fix-ui-base-build-error-0.63.x

Clean re-do of patches from https://github.com/brave/brave-core/pull/…
brave · Apr 4, 2019 · 23008de · 23008de
2 parents 37ff029 + ae19619
commit 23008de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..25349fd0787e0fd9c913fab16d3c646bf856f1f9 100644
+index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..3fbf1a1e7276481638ad79943b9e4cfa51ed6698 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -395,6 +395,7 @@ jumbo_component("base") {
@@ -10,3 +10,12 @@ index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..25349fd0787e0fd9c913fab16d3c646b
      "//net",
      "//third_party/icu",
      "//third_party/zlib:zlib",
+@@ -407,6 +408,8 @@ jumbo_component("base") {
+     "//url",
+   ]
+
++  deps += [ "//brave/ui/base:chromium_deps" ]
++
+   if (!is_ios) {
+     # iOS does not use Chromium-specific code for event handling.
+     public_deps += [
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
@@ -0,0 +1,6 @@
+group("chromium_deps") {
+  deps = [
+    "//brave/ui/webui/resources",
+    "//brave/app:brave_generated_resources_grit",
+  ]
+}