Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: ios/third_party/material_roboto_font_loader_ios/BUILD.gn

Issue 2618583004: Roll material_components_ios & material_roboto_font_loader_ios. (Closed)
Patch Set: Address comments. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/third_party/material_roboto_font_loader_ios/BUILD.gn
diff --git a/ios/third_party/material_roboto_font_loader_ios/BUILD.gn b/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
index b013f748c2d3935fef5d28ca19b214a1ad5e057b..7f6d49d4040e619b0a9956e7cd9d5b57e710a530 100644
--- a/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
+++ b/ios/third_party/material_roboto_font_loader_ios/BUILD.gn
@@ -2,19 +2,32 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# TODO(crbug.com/673904): Version v1.1.1 of material_components_ios uses a
+# CocoaPods path to access MaterialTypography.h which breaks Chromium build.
+# This variable protects the workaround so that it is clear what needs to be
+# updated once upstream code has been fixed.
+use_material_typography_workaround = true
+
config("material_roboto_font_loader_ios_config") {
include_dirs = [ "src/src" ]
visibility = [ ":material_roboto_font_loader_ios" ]
+
+ if (use_material_typography_workaround) {
+ include_dirs += [ "local_src" ]
+ }
}
source_set("material_roboto_font_loader_ios") {
sources = [
+ "src/src/MDCTypographyAdditions/MDFRobotoFontLoader+MDCTypographyAdditions.h",
+ "src/src/MDCTypographyAdditions/MDFRobotoFontLoader+MDCTypographyAdditions.m",
"src/src/MDFRobotoFontLoader.h",
"src/src/MDFRobotoFontLoader.m",
"src/src/MaterialRobotoFontLoader.h",
]
deps = [
":material_roboto_font_loader_bundle",
+ "//ios/third_party/material_components_ios",
"//ios/third_party/material_font_disk_loader_ios",
]
public_configs = [ ":material_roboto_font_loader_ios_config" ]

Powered by Google App Engine
This is Rietveld 408576698