[cr142][ios] MaterialComponents removed upstream
Chromium changes: https://chromium.googlesource.com/chromium/src/+/5068b9f045eb4ce7a2d57ea33998ddf60bea2a2c commit 5068b9f045eb4ce7a2d57ea33998ddf60bea2a2c Author: Sylvain Defresne <sdefresne@chromium.org> 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 <sdefresne@chromium.org> Reviewed-by: Rick Byers <rbyers@chromium.org> Cr-Commit-Position: refs/heads/main@{#1517995}
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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" ]
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user