Drop imports for build/config/features.gni from buildflags.gni files

These imports are not strictly needed and can be the source of
dependency cycles if certain GN/GNI files get imported in some
ways, so we better remove them and eliminate that friction.

Additionally, this change implies that we need to explicitly add
an import for brave/components/decentralized_dns/buildflags in
brave/browser/profiles/BUILD.gn now, since that file needs the
definitions for decentralized_dns that were previously being
imported via brave/components/tor/buildflags/buildflags.gni:

brave/browser/profiles/BUILD.gn
└─> brave/components/tor/buildflags/buildflags.gni
     └─> build/config/features.gni
          └─> build/config/chrome_build.gni
               └─> brave/build/config/brave_build.gni
                    └─> brave/net/sources.gni
                         └─> brave/components/decentralized_dns/buildflags/buildflags.gni

... but now that build/config/features.gni is no longer being
imported from brave/components/tor/buildflags/buildflags.gni, we
need to explicitly add the import to brave/browser/profiles/BUILD.gn
or we'll get a new gn check failure.

Resolves https://github.com/brave/brave-browser/issues/15171
This commit is contained in:
Mario Sanchez Prada
2021-04-07 12:45:50 +02:00
parent 2012f2d902
commit ec8635f9f9
15 changed files with 1 additions and 22 deletions
+1
View File
@@ -1,3 +1,4 @@
import("//brave/components/decentralized_dns/buildflags/buildflags.gni")
import("//brave/components/tor/buildflags/buildflags.gni")
import("//components/gcm_driver/config.gni")
@@ -1,5 +1,4 @@
import("//brave/build/config.gni")
import("//build/config/features.gni")
import("//extensions/buildflags/buildflags.gni")
declare_args() {
@@ -1,5 +1,4 @@
import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
import("//build/config/features.gni")
declare_args() {
brave_ads_enabled =
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
enable_brave_referrals = is_mac || is_linux || is_win || is_android
}
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
brave_rewards_enabled = is_mac || is_linux || is_win || is_android
}
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
brave_stp_enabled = false
}
@@ -1,5 +1,4 @@
import("//brave/build/config.gni")
import("//build/config/features.gni")
declare_args() {
enable_brave_sync = true
@@ -1,5 +1,4 @@
import("//brave/build/config.gni")
import("//build/config/features.gni")
declare_args() {
brave_together_enabled = brave_channel == "nightly"
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
crypto_dot_com_enabled = is_mac || is_linux || is_win
}
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
gemini_enabled = is_mac || is_linux || is_win
}
@@ -1,4 +1,3 @@
import("//build/config/features.gni")
import("//extensions/buildflags/buildflags.gni")
declare_args() {
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
ipfs_enabled = !is_ios
}
-2
View File
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
brave_p3a_enabled = true
}
-1
View File
@@ -1,5 +1,4 @@
import("//brave/build/config.gni")
import("//build/config/features.gni")
declare_args() {
enable_speedreader = !is_android
-2
View File
@@ -1,5 +1,3 @@
import("//build/config/features.gni")
declare_args() {
enable_tor = !is_android
}