Commit 40566643 authored by stkhapugin@chromium.org's avatar stkhapugin@chromium.org Committed by Commit Bot

[iOS] Roll Material Components to 92154b6f

Rolls MDC and updates the BUILD.gn following the changes in MDC.

Bug: 831114
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ida3e76d77c68be7830575a2c261d214c51fd81dd
Reviewed-on: https://chromium-review.googlesource.com/1005156Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549529}
parent fcb95656
......@@ -224,7 +224,7 @@ deps = {
},
'src/ios/third_party/material_components_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '8c8aad6dc245a6682544952e9d47c44149bffb33',
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '92154b6fa3348906eed6ac4c151fe00f4e270236',
'condition': 'checkout_ios',
},
......
......@@ -23,6 +23,8 @@ config("config") {
"src/components/OverlayWindow/src",
"src/components/Palettes/src",
"src/components/ProgressView/src",
"src/components/schemes/Color/src",
"src/components/schemes/Typography/src",
"src/components/ShadowElevations/src",
"src/components/ShadowLayer/src",
"src/components/Snackbar/src",
......@@ -214,8 +216,6 @@ source_set("material_components_ios") {
"src/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h",
"src/components/Snackbar/src/private/MDCSnackbarOverlayView.h",
"src/components/Snackbar/src/private/MDCSnackbarOverlayView.m",
"src/components/Themes/src/MDCColorScheme.h",
"src/components/Themes/src/MDCColorScheme.m",
"src/components/Typography/src/MDCTypography.h",
"src/components/Typography/src/MDCTypography.m",
"src/components/Typography/src/MaterialTypography.h",
......@@ -275,6 +275,15 @@ source_set("material_components_ios") {
"src/components/private/UIMetrics/src/MDCLayoutMetrics.h",
"src/components/private/UIMetrics/src/MDCLayoutMetrics.m",
"src/components/private/UIMetrics/src/MaterialUIMetrics.h",
"src/components/schemes/Color/src/MDCLegacyColorScheme.h",
"src/components/schemes/Color/src/MDCLegacyColorScheme.m",
"src/components/schemes/Color/src/MDCLegacyTonalColorScheme.h",
"src/components/schemes/Color/src/MDCLegacyTonalColorScheme.m",
"src/components/schemes/Color/src/MDCLegacyTonalPalette.h",
"src/components/schemes/Color/src/MDCLegacyTonalPalette.m",
"src/components/schemes/Color/src/MDCSemanticColorScheme.h",
"src/components/schemes/Color/src/MDCSemanticColorScheme.m",
"src/components/schemes/Color/src/MaterialColorScheme.h",
]
include_dirs = [
"src/components/ActivityIndicator/src",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment