Merge pull request #4504 from brave/fix-shields-android-1.5x

Uplift fixing the build to 1.5.x (#4499 and #4505)
brave · Feb 4, 2020 · 8471409 · 8471409
2 parents d0e9473 + 918c5bb
commit 8471409
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -131,6 +131,7 @@ source_set("browser_process") {
     "//brave/components/brave_referrals/browser",
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_shields/browser",
+    "//brave/components/brave_shields/common",
     "//brave/components/brave_wayback_machine:buildflags",
     "//brave/components/brave_webtorrent/browser/buildflags",
     "//brave/components/content_settings/core/browser",

diff --git a/components/brave_shields/browser/BUILD.gn b/components/brave_shields/browser/BUILD.gn
@@ -57,6 +57,7 @@ source_set("browser") {
   deps = [
     "//base",
     "//brave/components/brave_component_updater/browser",
+    "//brave/components/brave_shields/common",
     "//brave/components/content_settings/core/browser",
     "//brave/content:common",
     "//brave/vendor/adblock_rust_ffi:adblock_ffi",

diff --git a/components/brave_shields/common/BUILD.gn b/components/brave_shields/common/BUILD.gn
@@ -4,4 +4,8 @@ source_set("common") {
     "features.cc",
     "features.h",
   ]
+
+  deps = [
+    "//base",
+  ]
 }
diff --git a/components/brave_shields/common/features.cc b/components/brave_shields/common/features.cc
@@ -6,8 +6,6 @@
 #include "brave/components/brave_shields/common/features.h"
 
 #include "base/feature_list.h"
-#include "build/build_config.h"
-#include "ui/base/ui_base_features.h"
 
 namespace brave_shields {
 namespace features {