From 46dbe5fe34107e227ed0132f5f2a7c5e8d2b0f98 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 22 Sep 2025 20:39:59 -0400 Subject: [PATCH] [cr142][ios] MaterialComponents removed upstream Chromium changes: https://chromium.googlesource.com/chromium/src/+/5068b9f045eb4ce7a2d57ea33998ddf60bea2a2c commit 5068b9f045eb4ce7a2d57ea33998ddf60bea2a2c Author: Sylvain Defresne Date: Fri Sep 19 09:03:38 2025 -0700 [ios] Remove MaterialComponents and its dependencies Those libraries are no longer used, so remove them from DEPS and git submodules. This is part of a multi CL change: - http://cl/808555604 - https://crrev.com/i/8602518 => https://crrev.com/c/6966159 Fixed: 443947340 Change-Id: I05ce8d11347e2cb3225653062dd520384725847b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6966159 Commit-Queue: Sylvain Defresne Reviewed-by: Rick Byers Cr-Commit-Position: refs/heads/main@{#1517995} --- chromium_src/ios/chrome/DEPS | 1 - ios/BUILD.gn | 7 ------- ios/app/BUILD.gn | 4 ---- ios/brave-ios/Package.swift | 11 ++--------- ios/browser/providers/BUILD.gn | 7 +------ script/ios_bootstrap.py | 5 +---- 6 files changed, 4 insertions(+), 31 deletions(-) diff --git a/chromium_src/ios/chrome/DEPS b/chromium_src/ios/chrome/DEPS index 69af31aa692..b4cc6df775f 100644 --- a/chromium_src/ios/chrome/DEPS +++ b/chromium_src/ios/chrome/DEPS @@ -23,7 +23,6 @@ include_rules = [ "-ios/web/public/web_view_only", # Disallow direct uses of libraries that compose MaterialComponents. - "+ios/third_party/material_components_ios", "-ios/third_party/material_font_disk_loader_ios", "-ios/third_party/material_internationalization_ios", "-ios/third_party/material_roboto_font_loader_ios", diff --git a/ios/BUILD.gn b/ios/BUILD.gn index ccc51fe258a..7554c94324a 100644 --- a/ios/BUILD.gn +++ b/ios/BUILD.gn @@ -70,7 +70,6 @@ group("brave_ios") { public_deps = [ ":brave_core_xcframework", ":generated_xcconfig", - ":material_components_xcframework", ":nala_assets_xcframework", ] if (ios_partition_alloc_enabled) { @@ -248,12 +247,6 @@ ios_create_xcframework("brave_core_xcframework") { deps = [ ":brave_core_ios_framework" ] } -ios_create_xcframework("material_components_xcframework") { - framework_dir = "$root_build_dir/MaterialComponents.framework" - fix_info_plist_versions = true - deps = [ "//ios/third_party/material_components_ios" ] -} - ios_create_xcframework("nala_assets_xcframework") { framework_dir = "$root_build_dir/NalaAssets.framework" deps = [ "//brave/ios/nala:nala_assets_framework" ] diff --git a/ios/app/BUILD.gn b/ios/app/BUILD.gn index fedd211371e..6f8e80e78df 100644 --- a/ios/app/BUILD.gn +++ b/ios/app/BUILD.gn @@ -131,10 +131,6 @@ source_set("app") { deps += [ "//ios/chrome/browser/credential_provider/model" ] } - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - frameworks = [ "Foundation.framework", "UIKit.framework", diff --git a/ios/brave-ios/Package.swift b/ios/brave-ios/Package.swift index 182a28dd5fd..b36749b7ade 100644 --- a/ios/brave-ios/Package.swift +++ b/ios/brave-ios/Package.swift @@ -16,7 +16,7 @@ var package = Package( .library(name: "Shared", targets: ["Shared"]), .library( name: "BraveCore", - targets: ["BraveCore", "MaterialComponents", "PartitionAllocSupport"] + targets: ["BraveCore", "PartitionAllocSupport"] ), .library(name: "BraveShared", targets: ["BraveShared"]), .library(name: "BraveShields", targets: ["BraveShields"]), @@ -89,7 +89,6 @@ var package = Package( "Shared", "BraveWallet", "BraveCore", - "MaterialComponents", "PartitionAllocSupport", "BraveUI", "DesignSystem", @@ -260,7 +259,6 @@ var package = Package( name: "Shared", dependencies: [ "BraveCore", - "MaterialComponents", "Strings", ], plugins: ["LoggerPlugin"] @@ -278,7 +276,7 @@ var package = Package( .testTarget( name: "CertificateUtilitiesTests", dependencies: [ - "CertificateUtilities", "BraveShared", "BraveCore", "MaterialComponents", + "CertificateUtilities", "BraveShared", "BraveCore", "PartitionAllocSupport", ], exclude: ["Certificates/self-signed.conf"], @@ -338,10 +336,6 @@ var package = Package( path: "../../../out/ios_current_link/PartitionAllocSupport.xcframework" ), .binaryTarget(name: "BraveCore", path: "../../../out/ios_current_link/BraveCore.xcframework"), - .binaryTarget( - name: "MaterialComponents", - path: "../../../out/ios_current_link/MaterialComponents.xcframework" - ), .binaryTarget( name: "GRDWireGuardKit", path: "../third_party/GRDWireGuardKit/GRDWireGuardKit.xcframework" @@ -376,7 +370,6 @@ var package = Package( dependencies: [ "Data", "BraveCore", - "MaterialComponents", "PartitionAllocSupport", "BraveShared", "BraveUI", diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn index 9af0d4aa133..44722c69f1b 100644 --- a/ios/browser/providers/BUILD.gn +++ b/ios/browser/providers/BUILD.gn @@ -4,8 +4,7 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. # This is a variant of //ios/chrome/browser/providers:chromium_providers which -# does not include bundling the MaterialComponents framework or Chromium -# providers we don't need. +# does not include Chromium providers we don't need. group("brave_providers") { deps = [ "//brave/ios/browser/providers/lottie:chromium_lottie_animation", @@ -58,9 +57,5 @@ group("brave_providers") { "//ios/chrome/browser/providers/url_rewriters:chromium_url_rewriters", "//ios/chrome/browser/providers/user_feedback:chromium_user_feedback", "//ios/chrome/browser/providers/voice_search:chromium_voice_search", - - # The provider API needs to provide MaterialDesignComponent API (as the - # internal provider provides an alternate implementation). - "//ios/third_party/material_components_ios:material_components_ios+link", ] } diff --git a/script/ios_bootstrap.py b/script/ios_bootstrap.py index c79b35ad8d4..72186fe1e3b 100755 --- a/script/ios_bootstrap.py +++ b/script/ios_bootstrap.py @@ -63,10 +63,7 @@ def create_required_spm_resources(force=False): # These are essentially the bare-essential requirements for SPM to validate # the Package.swift manifest: The existence of the xcframework directory # itself, plus a valid Info.plist inside it. - frameworks = [ - 'BraveCore', 'MaterialComponents', 'NalaAssets', - 'PartitionAllocSupport' - ] + frameworks = ['BraveCore', 'NalaAssets', 'PartitionAllocSupport'] for frmk in frameworks: framework_dir = os.path.join(ios_current_link, f'{frmk}.xcframework') if force and os.path.exists(framework_dir):