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

Unified Diff: ios/third_party/material_roboto_font_loader_ios/local_src/MaterialComponents/MaterialTypography.h

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
« no previous file with comments | « ios/third_party/material_roboto_font_loader_ios/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/third_party/material_roboto_font_loader_ios/local_src/MaterialComponents/MaterialTypography.h
diff --git a/ios/third_party/material_roboto_font_loader_ios/local_src/MaterialComponents/MaterialTypography.h b/ios/third_party/material_roboto_font_loader_ios/local_src/MaterialComponents/MaterialTypography.h
new file mode 100644
index 0000000000000000000000000000000000000000..becdfe53821ead75bd5ee02af4885fc5979afd5b
--- /dev/null
+++ b/ios/third_party/material_roboto_font_loader_ios/local_src/MaterialComponents/MaterialTypography.h
@@ -0,0 +1,19 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_THIRD_PARTY_MATERIAL_ROBOTO_FONT_LOADER_IOS_LOCAL_SRC_MATERIALCOMPONENTS_MATERIALTYPOGRAPHY_H_
+#define IOS_THIRD_PARTY_MATERIAL_ROBOTO_FONT_LOADER_IOS_LOCAL_SRC_MATERIALCOMPONENTS_MATERIALTYPOGRAPHY_H_
+
+// Version v1.1.1 of material_components_ios uses a CocoaPods path to access
+// MaterialTypography.h which breaks Chromium build. This file should be
+// deleted once upstream code has been fixed.
+
+// Use #import <> to force lookup in the directories listed in include_dirs
+// thus allowing importing the file from material_components_ios instead of
+// the current file (as using #import "" will start the file lookup in the
+// current directory and will resolve to the current file, aka auto-import).
+
+#import <MaterialTypography.h>
+
+#endif // IOS_THIRD_PARTY_MATERIAL_ROBOTO_FONT_LOADER_IOS_LOCAL_SRC_MATERIALCOMPONENTS_MATERIALTYPOGRAPHY_H_
« no previous file with comments | « ios/third_party/material_roboto_font_loader_ios/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698