Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deps *brave_process* target in //brave/browser/ #6830

Closed
wants to merge 1 commit into from
Closed

Fix deps *brave_process* target in //brave/browser/ #6830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 28 additions & 45 deletions browser/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import("//brave/build/config.gni")
import("//brave/components/binance/browser/buildflags/buildflags.gni")
import("//brave/components/brave_together/buildflags/buildflags.gni")
import("//brave/components/moonpay/browser/buildflags/buildflags.gni")
import("//brave/components/gemini/browser/buildflags/buildflags.gni")
Expand All @@ -24,8 +23,6 @@ import("//third_party/protobuf/proto_library.gni")
import("//third_party/widevine/cdm/widevine.gni")

source_set("browser_process") {
# Remove when https://github.com/brave/brave-browser/issues/10657 is resolved
check_includes = false
visibility = [
"//chrome/browser/*",
"//brave/browser/*",
Expand All @@ -38,24 +35,10 @@ source_set("browser_process") {
]

sources = [
"autocomplete/brave_autocomplete_scheme_classifier.cc",
"autocomplete/brave_autocomplete_scheme_classifier.h",
"brave_shields/ad_block_pref_service_factory.cc",
"brave_shields/ad_block_pref_service_factory.h",
"brave_shields/cookie_pref_service_factory.cc",
"brave_shields/cookie_pref_service_factory.h",
"brave_browser_main_extra_parts.cc",
"brave_browser_main_extra_parts.h",
"brave_browser_main_parts.cc",
"brave_browser_main_parts.h",
"brave_browser_process_impl.cc",
"brave_browser_process_impl.h",
"brave_content_browser_client.cc",
"brave_content_browser_client.h",
"brave_local_state_prefs.cc",
"brave_local_state_prefs.h",
"brave_profile_prefs.cc",
"brave_profile_prefs.h",
"brave_tab_helpers.cc",
"brave_tab_helpers.h",
"browser_context_keyed_service_factories.cc",
Expand Down Expand Up @@ -107,29 +90,44 @@ source_set("browser_process") {
":sparkle_buildflags",
":version_info",
"autoplay",
"brave_stats:stats_updater",
"browsing_data",
"content_settings",
"download",
"farbling",
"net",
"ntp_background_images",
"profiles",
"renderer_context_menu",
"search",
"themes",
"ui",
"//base",
"//brave/browser/gcm_driver:gcm_driver",
"//brave/browser/net",
"//brave/browser/notifications",
"//brave/browser/tor:buildflags",
"//brave/browser/translate/buildflags",
"//brave/browser/ui/bookmark:bookmark",
"//brave/chromium_src:browser",
"//brave/common",
"//brave/common:pref_names",
"//brave/common:switches",
"//brave/common/tor:tor",
"//brave/components/binance/browser/buildflags",
"//brave/components/gemini/browser/buildflags",
"//brave/components/crypto_dot_com/browser/buildflags",
"//brave/components/brave_component_updater/browser",
"//brave/components/brave_drm",
"//brave/components/brave_referrals/buildflags",
"//brave/components/brave_rewards/common:common",
"//brave/components/brave_shields/browser",
"//brave/components/brave_shields/common",
"//brave/components/brave_sync/buildflags:buildflags",
"//brave/components/brave_sync",
"//brave/components/brave_sync:features",
"//brave/components/brave_sync:network_time_helper",
"//brave/components/brave_sync:prefs",
"//brave/components/brave_together/browser",
"//brave/components/brave_wallet/browser/buildflags",
"//brave/components/brave_wayback_machine:buildflags",
Expand All @@ -141,50 +139,57 @@ source_set("browser_process") {
"//brave/components/moonpay/browser/buildflags",
"//brave/components/ntp_background_images/browser",
"//brave/components/ntp_tiles",
"//brave/components/p3a:buildflags",
"//brave/components/p3a",
"//brave/components/resources",
"//brave/components/speedreader:buildflags",
"//brave/components/weekly_storage",
"//brave/services/network/public/cpp",
"//chrome/browser/extensions:extensions",
"//chrome/browser/ui:ui",
"//chrome/common",
"//components/account_id:account_id",
"//components/autofill/core/common",
"//components/browsing_data/core",
"//components/component_updater",
"//components/content_settings/browser",
"//components/content_settings/core/common",
"//components/content_settings/core/browser",
"//components/crx_file:crx_file",
"//components/feed/core/shared_prefs:feed_shared_prefs",
"//components/embedder_support",
"//components/gcm_driver:gcm_driver",
"//components/gcm_driver:gcm_buildflags",
"//components/guest_view/browser:browser",
"//components/keyed_service/content",
"//components/metrics",
"//components/password_manager/core/common",
"//components/permissions",
"//components/policy/core/browser",
"//components/prefs",
"//components/pref_registry:pref_registry",
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//components/search_engines",
"//components/services/patch/content",
"//components/services/unzip/content",
"//components/sessions",
"//components/signin/public/base:base",
"//components/spellcheck/browser",
"//components/unified_consent",
"//components/update_client:network_impl",
"//components/update_client:patch_impl",
"//components/update_client:unzip_impl",
"//components/update_client:update_client",
"//components/web_modal:web_modal",
"//content/public/browser",
"//content/public/common",
"//extensions/buildflags",
"//brave/chromium_src:browser",
"brave_stats:stats_updater",
"browsing_data",
"search",
"themes",
"ntp_background_images",
"//services/network/public/cpp",
"//services/service_manager/embedder",
"//third_party/blink/public/mojom:mojom_platform_headers",
"//third_party/widevine/cdm:buildflags",
"//ui/base",
"//ui/web_dialogs:web_dialogs",
]

if (enable_tor) {
Expand Down Expand Up @@ -236,20 +241,6 @@ source_set("browser_process") {
]
}

if (binance_enabled) {
sources += [
"binance/binance_service_factory.cc",
"binance/binance_service_factory.h",
"binance/binance_protocol_handler.cc",
"binance/binance_protocol_handler.h",
]

deps += [
"//brave/components/binance/browser",
"//components/country_codes",
]
}

if (gemini_enabled) {
sources += [
"gemini/gemini_service_factory.cc",
Expand Down Expand Up @@ -402,14 +393,6 @@ source_set("browser_process") {
]
}

if (enable_widevine) {
sources += [
"brave_drm_tab_helper.cc",
"brave_drm_tab_helper.h",
]
deps += [ "//brave/browser/widevine" ]
}

if (enable_brave_perf_predictor) {
deps += [
"//brave/components/brave_perf_predictor/browser",
Expand Down
42 changes: 41 additions & 1 deletion browser/sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,49 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.

import("//brave/browser/importer/sources.gni")
import("//brave/components/binance/browser/buildflags/buildflags.gni")
import("//third_party/widevine/cdm/widevine.gni")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR needs to include widevine.gni to use enable_widevine guard in line #45. But, it causes below import loop error.

FAILED: build.ninja 
../../buildtools/linux64/gn --root=../.. -q gen .
ERROR //build/config/chrome_build.gni is part of an import loop.
See //brave/browser/sources.gni:8:1: whence it was imported.
import("//third_party/widevine/cdm/widevine.gni")
^-----------------------------------------------
See //brave/build/config/brave_build.gni:6:1: whence it was imported.
import("//brave/browser/sources.gni")
^-----------------------------------
See //build/config/chrome_build.gni:4:1: whence it was imported.
import("//brave/build/config/brave_build.gni")
^--------------------------------------------
See //build/config/compiler/compiler.gni:5:1: whence it was imported.
import("//build/config/chrome_build.gni")
^---------------------------------------
See //BUILD.gn:11:1: whence it was imported.
import("//build/config/compiler/compiler.gni")
^--------------------------------------------
ninja: error: rebuilding 'build.ninja': subcommand failed


brave_chrome_browser_sources = []
brave_chrome_browser_sources = [
"//brave/browser/autocomplete/brave_autocomplete_scheme_classifier.cc",
"//brave/browser/autocomplete/brave_autocomplete_scheme_classifier.h",
"//brave/browser/brave_local_state_prefs.cc",
"//brave/browser/brave_local_state_prefs.h",
"//brave/browser/brave_browser_main_extra_parts.cc",
"//brave/browser/brave_browser_main_extra_parts.h",
"//brave/browser/brave_browser_main_parts.cc",
"//brave/browser/brave_browser_main_parts.h",
"//brave/browser/brave_browser_process_impl.cc",
"//brave/browser/brave_browser_process_impl.h",
"//brave/browser/brave_profile_prefs.cc",
"//brave/browser/brave_profile_prefs.h",
"//brave/browser/brave_shields/cookie_pref_service_factory.cc",
"//brave/browser/brave_shields/cookie_pref_service_factory.h",
]
brave_chrome_browser_sources += brave_chrome_browser_importer_sources

brave_chrome_browser_deps = []
brave_chrome_browser_deps += brave_chrome_browser_importer_deps

if (binance_enabled) {
brave_chrome_browser_sources += [
"//brave/browser/binance/binance_service_factory.cc",
"//brave/browser/binance/binance_service_factory.h",
"//brave/browser/binance/binance_protocol_handler.cc",
"//brave/browser/binance/binance_protocol_handler.h",
]

brave_chrome_browser_deps += [
"//brave/components/binance/browser",
"//components/country_codes",
]
}

if (enable_widevine) {
brave_chrome_browser_sources += [
"brave_drm_tab_helper.cc",
"brave_drm_tab_helper.h",
]
brave_chrome_browser_deps += [ "//brave/browser/widevine" ]
}

2 changes: 0 additions & 2 deletions components/binance/browser/buildflags/buildflags.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import("//build/config/features.gni")

declare_args() {
binance_enabled = is_mac || is_linux || is_win
}