diff --git a/browser/BUILD.gn b/browser/BUILD.gn index 5aa701bca581..d5b47855f982 100644 --- a/browser/BUILD.gn +++ b/browser/BUILD.gn @@ -1,5 +1,4 @@ import("//brave/build/config.gni") -import("//brave/components/binance/browser/buildflags/buildflags.gni") import("//brave/components/brave_ads/browser/buildflags/buildflags.gni") import( "//brave/components/brave_perf_predictor/browser/buildflags/buildflags.gni") @@ -25,8 +24,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/*", @@ -39,54 +36,10 @@ source_set("browser_process") { ] sources = [ - "autocomplete/brave_autocomplete_scheme_classifier.cc", - "autocomplete/brave_autocomplete_scheme_classifier.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_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_tab_helpers.cc", - "brave_tab_helpers.h", - "browser_context_keyed_service_factories.cc", - "browser_context_keyed_service_factories.h", "component_updater/brave_component_installer.cc", "component_updater/brave_component_installer.h", - "component_updater/brave_component_updater_configurator.cc", - "component_updater/brave_component_updater_configurator.h", - "component_updater/brave_component_updater_delegate.cc", - "component_updater/brave_component_updater_delegate.h", - "geolocation/brave_geolocation_permission_context_delegate.cc", - "geolocation/brave_geolocation_permission_context_delegate.h", "metrics/metrics_reporting_util.cc", "metrics/metrics_reporting_util.h", - "search_engines/guest_window_search_engine_provider_service.cc", - "search_engines/guest_window_search_engine_provider_service.h", - "search_engines/private_window_search_engine_provider_service.cc", - "search_engines/private_window_search_engine_provider_service.h", - "search_engines/search_engine_provider_service.cc", - "search_engines/search_engine_provider_service.h", - "search_engines/search_engine_provider_service_factory.cc", - "search_engines/search_engine_provider_service_factory.h", - "search_engines/search_engine_provider_util.cc", - "search_engines/search_engine_provider_util.h", - "search_engines/search_engine_tracker.cc", - "search_engines/search_engine_tracker.h", - "search_engines/tor_window_search_engine_provider_service.cc", - "search_engines/tor_window_search_engine_provider_service.h", - "sync/brave_profile_sync_service_delegate.cc", - "sync/brave_profile_sync_service_delegate.h", "update_util.cc", "update_util.h", ] @@ -112,6 +65,8 @@ source_set("browser_process") { "autoplay", "brave_stats:stats_updater", "browsing_data", + "brave_stats:stats_updater", + "browsing_data", "content_settings", "download", "ephemeral_storage", @@ -124,18 +79,27 @@ source_set("browser_process") { "themes", "ui", "//base", + "//brave/browser/gcm_driver:gcm_driver", "//brave/browser/net", "//brave/browser/notifications", "//brave/browser/translate/buildflags", + "//brave/browser/ui/bookmark:bookmark", + "//brave/chromium_src:browser", "//brave/common", "//brave/common:pref_names", + "//brave/common:switches", "//brave/components/binance/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/buildflags", "//brave/components/brave_wayback_machine:buildflags", @@ -149,38 +113,50 @@ 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/tor/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/browser", "//components/content_settings/core/common", + "//components/crx_file:crx_file", + "//components/feed/core/shared_prefs:feed_shared_prefs", "//components/embedder_support", "//components/gcm_driver:gcm_buildflags", "//components/gcm_driver:gcm_driver", + "//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/signin/public/base:base", "//components/sessions", "//components/sync_device_info", "//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", @@ -189,6 +165,7 @@ source_set("browser_process") { "//third_party/blink/public/mojom:mojom_platform_headers", "//third_party/widevine/cdm:buildflags", "//ui/base", + "//ui/web_dialogs:web_dialogs", ] if (brave_wallet_enabled) { @@ -209,99 +186,6 @@ source_set("browser_process") { deps += [ "//brave/components/brave_sync" ] } - if (!is_android) { - sources += [ - "p3a/p3a_core_metrics.cc", - "p3a/p3a_core_metrics.h", - ] - - deps += [ - "importer", - "infobars", - "//brave/app:brave_generated_resources_grit", - ] - } else { - deps += [ "android:android_browser_process" ] - } - - if (binance_enabled) { - sources += [ - "binance/binance_protocol_handler.cc", - "binance/binance_protocol_handler.h", - "binance/binance_service_factory.cc", - "binance/binance_service_factory.h", - ] - - deps += [ - "//brave/components/binance/browser", - "//components/country_codes", - ] - - if (is_android) { - sources += [ - "binance/android/binance_native_worker.cc", - "binance/android/binance_native_worker.h", - ] - } - } - - if (gemini_enabled) { - sources += [ - "gemini/gemini_protocol_handler.cc", - "gemini/gemini_protocol_handler.h", - "gemini/gemini_service_factory.cc", - "gemini/gemini_service_factory.h", - ] - - deps += [ - "//base", - "//brave/browser/profiles", - "//brave/common", - "//brave/components/gemini/browser", - "//components/country_codes", - "//components/keyed_service/content", - "//components/user_prefs", - "//content/public/browser", - "//ui/base", - "//url", - ] - } - - if (crypto_dot_com_enabled) { - sources += [ - "crypto_dot_com/crypto_dot_com_service_factory.cc", - "crypto_dot_com/crypto_dot_com_service_factory.h", - ] - - deps += [ - "//base", - "//brave/browser/profiles", - "//brave/components/crypto_dot_com/browser", - "//brave/components/crypto_dot_com/common", - "//components/keyed_service/content", - ] - } - - if (ipfs_enabled) { - sources += [ - "ipfs/content_browser_client_helper.cc", - "ipfs/content_browser_client_helper.h", - "ipfs/ipfs_service_factory.cc", - "ipfs/ipfs_service_factory.h", - "ipfs/ipfs_tab_helper.cc", - "ipfs/ipfs_tab_helper.h", - ] - - deps += [ - "//brave/browser/infobars", - "//brave/components/ipfs", - "//brave/components/services/ipfs/public/mojom", - "//components/user_prefs", - "//extensions/browser", - "//extensions/common", - ] - } - if (brave_together_enabled) { deps += [ "//brave/components/brave_together/browser" ] } @@ -348,32 +232,11 @@ source_set("browser_process") { } if (brave_rewards_enabled) { - sources += [ - "brave_rewards/rewards_service_factory.cc", - "brave_rewards/rewards_service_factory.h", - "brave_rewards/rewards_tab_helper.cc", - "brave_rewards/rewards_tab_helper.h", - ] - - if (enable_extensions) { - sources += [ - "brave_rewards/extension_rewards_notification_service_observer.cc", - "brave_rewards/extension_rewards_notification_service_observer.h", - "brave_rewards/extension_rewards_service_observer.cc", - "brave_rewards/extension_rewards_service_observer.h", - ] - } - if (is_android) { sources += [ "brave_rewards/android/brave_rewards_native_worker.cc", "brave_rewards/android/brave_rewards_native_worker.h", ] - } else { - sources += [ - "brave_rewards/tip_dialog.cc", - "brave_rewards/tip_dialog.h", - ] } deps += [ @@ -390,28 +253,10 @@ source_set("browser_process") { deps += [ "//brave/components/brave_wayback_machine" ] } - 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" ] } - if (enable_speedreader) { - sources += [ - "//brave/browser/speedreader/speedreader_service_factory.cc", - "//brave/browser/speedreader/speedreader_service_factory.h", - "//brave/browser/speedreader/speedreader_tab_helper.cc", - "//brave/browser/speedreader/speedreader_tab_helper.h", - ] - deps += [ "//brave/components/speedreader" ] - } - if (is_win && is_official_build) { sources += [ "//chrome/browser/google/google_update_win.cc", diff --git a/browser/sources.gni b/browser/sources.gni index ab76e1f49188..4e49325a9468 100644 --- a/browser/sources.gni +++ b/browser/sources.gni @@ -7,8 +7,61 @@ import("//brave/browser/brave_wallet/sources.gni") import("//brave/browser/importer/sources.gni") import("//brave/browser/new_tab/sources.gni") import("//brave/browser/themes/sources.gni") +import("//brave/components/binance/browser/buildflags/buildflags.gni") +import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni") +import("//brave/components/crypto_dot_com/browser/buildflags/buildflags.gni") +import("//brave/components/gemini/browser/buildflags/buildflags.gni") +import("//brave/components/ipfs/buildflags/buildflags.gni") +import("//brave/components/speedreader/buildflags.gni") +import("//extensions/buildflags/buildflags.gni") +import("//brave/build/features.gni") -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_content_browser_client.cc", + "//brave/browser/brave_content_browser_client.h", + "//brave/browser/brave_tab_helpers.cc", + "//brave/browser/brave_tab_helpers.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/ad_block_pref_service_factory.cc", + "//brave/browser/brave_shields/ad_block_pref_service_factory.h", + "//brave/browser/brave_shields/cookie_pref_service_factory.cc", + "//brave/browser/brave_shields/cookie_pref_service_factory.h", + "//brave/browser/browser_context_keyed_service_factories.cc", + "//brave/browser/browser_context_keyed_service_factories.h", + "//brave/browser/component_updater/brave_component_updater_configurator.cc", + "//brave/browser/component_updater/brave_component_updater_configurator.h", + "//brave/browser/component_updater/brave_component_updater_delegate.cc", + "//brave/browser/component_updater/brave_component_updater_delegate.h", + "//brave/browser/geolocation/brave_geolocation_permission_context_delegate.cc", + "//brave/browser/geolocation/brave_geolocation_permission_context_delegate.h", + "//brave/browser/search_engines/guest_window_search_engine_provider_service.cc", + "//brave/browser/search_engines/guest_window_search_engine_provider_service.h", + "//brave/browser/search_engines/private_window_search_engine_provider_service.cc", + "//brave/browser/search_engines/private_window_search_engine_provider_service.h", + "//brave/browser/search_engines/search_engine_tracker.cc", + "//brave/browser/search_engines/search_engine_tracker.h", + "//brave/browser/search_engines/search_engine_provider_service_factory.cc", + "//brave/browser/search_engines/search_engine_provider_service_factory.h", + "//brave/browser/search_engines/search_engine_provider_util.cc", + "//brave/browser/search_engines/search_engine_provider_util.h", + "//brave/browser/search_engines/search_engine_provider_service.cc", + "//brave/browser/search_engines/search_engine_provider_service.h", + "//brave/browser/search_engines/tor_window_search_engine_provider_service.cc", + "//brave/browser/search_engines/tor_window_search_engine_provider_service.h", + "//brave/browser/sync/brave_profile_sync_service_delegate.cc", + "//brave/browser/sync/brave_profile_sync_service_delegate.h", +] brave_chrome_browser_sources += brave_browser_themes_sources brave_chrome_browser_sources += brave_browser_wallet_sources brave_chrome_browser_sources += brave_chrome_browser_importer_sources @@ -16,12 +69,153 @@ brave_chrome_browser_sources += brave_browser_new_tab_sources brave_chrome_browser_deps = [ "//brave/browser:browser_process", + "//brave/vendor/bat-native-ledger", ] brave_chrome_browser_deps += brave_browser_themes_deps brave_chrome_browser_deps += brave_browser_wallet_deps brave_chrome_browser_deps += brave_chrome_browser_importer_deps brave_chrome_browser_deps += brave_browser_new_tab_deps +if (binance_enabled) { + brave_chrome_browser_sources += [ + "//brave/browser/binance/binance_protocol_handler.cc", + "//brave/browser/binance/binance_protocol_handler.h", + "//brave/browser/binance/binance_service_factory.cc", + "//brave/browser/binance/binance_service_factory.h", + ] + + brave_chrome_browser_deps += [ + "//brave/components/binance/browser", + "//components/country_codes", + ] + + if (is_android) { + brave_chrome_browser_sources += [ + "//brave/browser/binance/android/binance_native_worker.cc", + "//brave/browser/binance/android/binance_native_worker.h", + ] + } +} + +if (brave_rewards_enabled) { + brave_chrome_browser_sources += [ + "//brave/browser/brave_rewards/rewards_service_factory.cc", + "//brave/browser/brave_rewards/rewards_service_factory.h", + "//brave/browser/brave_rewards/rewards_tab_helper.cc", + "//brave/browser/brave_rewards/rewards_tab_helper.h", + ] + + if (enable_extensions) { + brave_chrome_browser_sources += [ + "//brave/browser/brave_rewards/extension_rewards_notification_service_observer.cc", + "//brave/browser/brave_rewards/extension_rewards_notification_service_observer.h", + "//brave/browser/brave_rewards/extension_rewards_service_observer.cc", + "//brave/browser/brave_rewards/extension_rewards_service_observer.h", + ] + } + if (!is_android) { + brave_chrome_browser_sources += [ + "//brave/browser/brave_rewards/tip_dialog.cc", + "//brave/browser/brave_rewards/tip_dialog.h", + ] + } + + brave_chrome_browser_deps += [ + "//brave/components/brave_rewards/browser", + "//brave/vendor/bat-native-ledger", + ] +} + +if (crypto_dot_com_enabled) { + brave_chrome_browser_sources += [ + "//brave/browser/crypto_dot_com/crypto_dot_com_service_factory.cc", + "//brave/browser/crypto_dot_com/crypto_dot_com_service_factory.h", + ] + + brave_chrome_browser_deps += [ + "//base", + "//brave/browser/profiles", + "//brave/components/crypto_dot_com/browser", + "//brave/components/crypto_dot_com/common", + "//components/keyed_service/content", + ] +} + +if (ipfs_enabled) { + brave_chrome_browser_sources += [ + "//brave/browser/ipfs/content_browser_client_helper.cc", + "//brave/browser/ipfs/content_browser_client_helper.h", + "//brave/browser/ipfs/ipfs_service_factory.cc", + "//brave/browser/ipfs/ipfs_service_factory.h", + "//brave/browser/ipfs/ipfs_tab_helper.cc", + "//brave/browser/ipfs/ipfs_tab_helper.h", + ] + + brave_chrome_browser_deps += [ + "//brave/browser/infobars", + "//brave/components/ipfs", + "//brave/components/services/ipfs/public/mojom", + "//components/user_prefs", + "//extensions/browser", + "//extensions/common", + ] +} + +if (gemini_enabled) { + brave_chrome_browser_sources += [ + "//brave/browser/gemini/gemini_protocol_handler.cc", + "//brave/browser/gemini/gemini_protocol_handler.h", + "//brave/browser/gemini/gemini_service_factory.cc", + "//brave/browser/gemini/gemini_service_factory.h", + ] + + brave_chrome_browser_deps += [ + "//base", + "//brave/browser/profiles", + "//brave/common", + "//brave/components/gemini/browser", + "//components/country_codes", + "//components/keyed_service/content", + "//components/user_prefs", + "//content/public/browser", + "//ui/base", + "//url", + ] +} + +if (enable_speedreader) { + brave_chrome_browser_sources += [ + "//brave/browser/speedreader/speedreader_service_factory.cc", + "//brave/browser/speedreader/speedreader_service_factory.h", + "//brave/browser/speedreader/speedreader_tab_helper.cc", + "//brave/browser/speedreader/speedreader_tab_helper.h", + ] + brave_chrome_browser_deps += [ "//brave/components/speedreader" ] +} + +if (enable_widevine) { + brave_chrome_browser_sources += [ + "//brave/browser/brave_drm_tab_helper.cc", + "//brave/browser/brave_drm_tab_helper.h", + ] + brave_chrome_browser_deps += [ "//brave/browser/widevine" ] +} + +if (!is_android) { + brave_chrome_browser_sources += [ + "//brave/browser/p3a/p3a_core_metrics.cc", + "//brave/browser/p3a/p3a_core_metrics.h", + ] + + brave_chrome_browser_deps += [ + "//brave/browser/importer", + "//brave/browser/infobars", + "//brave/app:brave_generated_resources_grit", + ] +} else { + brave_chrome_browser_deps += [ "android:android_browser_process" ] +} + brave_chrome_browser_public_deps = [ "//brave/components/brave_sync:constants", "//brave/components/variations:constants", diff --git a/build/features.gni b/build/features.gni index dda39e5751ea..98ce2c3da431 100644 --- a/build/features.gni +++ b/build/features.gni @@ -2,6 +2,12 @@ declare_args() { brave_chromium_build = true brave_services_key = "" + + # Enables Widevine key system support. Enabled by default in Google Chrome, + # on Android and Fuchsia platforms. + # Can be optionally enabled in Chromium on non-Android platforms. Please see + # //src/third_party/widevine/LICENSE file for details. + enable_widevine = is_android || is_fuchsia } brave_service_key_defines = [] diff --git a/components/binance/browser/buildflags/buildflags.gni b/components/binance/browser/buildflags/buildflags.gni index 40387e37fda3..d4bc81a78179 100644 --- a/components/binance/browser/buildflags/buildflags.gni +++ b/components/binance/browser/buildflags/buildflags.gni @@ -1,5 +1,3 @@ -import("//build/config/features.gni") - declare_args() { binance_enabled = is_mac || is_linux || is_win || is_android } diff --git a/components/brave_rewards/browser/buildflags/buildflags.gni b/components/brave_rewards/browser/buildflags/buildflags.gni index 79b648e8909d..18ad294e507e 100644 --- a/components/brave_rewards/browser/buildflags/buildflags.gni +++ b/components/brave_rewards/browser/buildflags/buildflags.gni @@ -1,5 +1,3 @@ -import("//build/config/features.gni") - declare_args() { brave_rewards_enabled = is_mac || is_linux || is_win || is_android } diff --git a/components/brave_wallet/buildflags/buildflags.gni b/components/brave_wallet/buildflags/buildflags.gni index a2e86acced61..81ee1ec5c162 100644 --- a/components/brave_wallet/buildflags/buildflags.gni +++ b/components/brave_wallet/buildflags/buildflags.gni @@ -1,4 +1,3 @@ -import("//build/config/features.gni") import("//extensions/buildflags/buildflags.gni") declare_args() { diff --git a/components/crypto_dot_com/browser/buildflags/buildflags.gni b/components/crypto_dot_com/browser/buildflags/buildflags.gni index 09b522d52de5..e0ebbbfed998 100644 --- a/components/crypto_dot_com/browser/buildflags/buildflags.gni +++ b/components/crypto_dot_com/browser/buildflags/buildflags.gni @@ -1,5 +1,3 @@ -import("//build/config/features.gni") - declare_args() { crypto_dot_com_enabled = is_mac || is_linux || is_win } diff --git a/components/gemini/browser/buildflags/buildflags.gni b/components/gemini/browser/buildflags/buildflags.gni index 843fd6b2c853..891f91852367 100644 --- a/components/gemini/browser/buildflags/buildflags.gni +++ b/components/gemini/browser/buildflags/buildflags.gni @@ -1,5 +1,3 @@ -import("//build/config/features.gni") - declare_args() { gemini_enabled = is_mac || is_linux || is_win } diff --git a/components/ipfs/buildflags/buildflags.gni b/components/ipfs/buildflags/buildflags.gni index 014a045c3015..e985a74d2422 100644 --- a/components/ipfs/buildflags/buildflags.gni +++ b/components/ipfs/buildflags/buildflags.gni @@ -1,5 +1,3 @@ -import("//build/config/features.gni") - declare_args() { ipfs_enabled = is_mac || is_linux || is_win } diff --git a/components/speedreader/BUILD.gn b/components/speedreader/BUILD.gn index 367894fb5693..02afdcfea760 100644 --- a/components/speedreader/BUILD.gn +++ b/components/speedreader/BUILD.gn @@ -1,8 +1,13 @@ import("//build/buildflag_header.gni") import("//brave/components/speedreader/buildflags.gni") +import("//brave/build/config.gni") buildflag_header("buildflags") { header = "buildflags.h" + enable_speedreader_feature = brave_channel == "nightly" + || brave_channel == "development" + || brave_channel == "dev" + || brave_channel == "beta" flags = [ "ENABLE_SPEEDREADER=$enable_speedreader", "ENABLE_SPEEDREADER_FEATURE=$enable_speedreader_feature", diff --git a/components/speedreader/buildflags.gni b/components/speedreader/buildflags.gni index 6d81a6a1cf50..3e3132666625 100644 --- a/components/speedreader/buildflags.gni +++ b/components/speedreader/buildflags.gni @@ -1,10 +1,3 @@ -import("//brave/build/config.gni") -import("//build/config/features.gni") - declare_args() { enable_speedreader = !is_android - enable_speedreader_feature = brave_channel == "nightly" - || brave_channel == "development" - || brave_channel == "dev" - || brave_channel == "beta" } diff --git a/patches/extensions-buildflags-buildflags.gni.patch b/patches/extensions-buildflags-buildflags.gni.patch new file mode 100644 index 000000000000..7b8a3344ac5c --- /dev/null +++ b/patches/extensions-buildflags-buildflags.gni.patch @@ -0,0 +1,13 @@ +diff --git a/extensions/buildflags/buildflags.gni b/extensions/buildflags/buildflags.gni +index 35d9c6cebd548e7895574b3192d31d1c97cede1a..ceb16cb6628145a0fb48b8fc40f3472e184879f1 100644 +--- a/extensions/buildflags/buildflags.gni ++++ b/extensions/buildflags/buildflags.gni +@@ -2,8 +2,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-import("//build/config/features.gni") +- + declare_args() { + enable_extensions = !is_android && !is_ios && !is_fuchsia + diff --git a/patches/third_party-widevine-cdm-widevine.gni.patch b/patches/third_party-widevine-cdm-widevine.gni.patch index b3e8d9865f11..721da45fe57b 100644 --- a/patches/third_party-widevine-cdm-widevine.gni.patch +++ b/patches/third_party-widevine-cdm-widevine.gni.patch @@ -1,8 +1,24 @@ diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni -index 036d03e36a13b7947f0a3cc1dfdc81823b080645..ab3eaf80f7f711d901d76cfb445afcec73c5ed51 100644 +index 036d03e36a13b7947f0a3cc1dfdc81823b080645..e1da33dd35fcbcb70747aab9ec743606574a880c 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni -@@ -42,6 +42,8 @@ enable_widevine_cdm_component = +@@ -4,14 +4,7 @@ + + import("//build/config/chrome_build.gni") + import("//media/media_options.gni") +- +-declare_args() { +- # Enables Widevine key system support. Enabled by default in Google Chrome, +- # on Android and Fuchsia platforms. +- # Can be optionally enabled in Chromium on non-Android platforms. Please see +- # //src/third_party/widevine/LICENSE file for details. +- enable_widevine = is_chrome_branded || is_android || is_fuchsia +-} ++import("//brave/build/features.gni") + + # Disable Widevine when running linux-chromeos. + if (is_chromeos && !is_chromeos_device) { +@@ -42,6 +35,8 @@ enable_widevine_cdm_component = # Widevine CDM is bundled as part of Google Chrome builds. bundle_widevine_cdm = enable_library_widevine_cdm && is_chrome_branded