Commit 315ecf09 authored by Olivier Robin's avatar Olivier Robin Committed by Commit Bot

Roll src/ios/third_party/material_components_ios/src 8e8b719e061c..4695792710cf (22 commits)

https://chromium.googlesource.com/external/github.com/material-components/material-components-ios/+log/8e8b719e061c..4695792710cf

git log 8e8b719e061c..4695792710cf --date=short --no-merges --format='%ad %ae %s'
2019-11-25 wenyuz@google.com Merge branch 'release-candidate' into stable
2019-11-14 wenyuz@google.com Merge branch 'release-candidate' into stable
2019-11-13 galiak@google.com Merge branch 'release-candidate' into stable
2019-11-08 andrewoverton@google.com Merge branch 'release-candidate' into stable
2019-11-07 rsmoore@google.com Merge branch 'release-candidate' into stable
2019-11-06 galiak@google.com Merge branch 'release-candidate' into stable
2019-11-01 featherless@google.com Merge branch 'release-candidate' into stable
2019-10-30 yarneo@gmail.com v93.2.0 (#8686)
2019-10-30 yarneo@gmail.com Merge branch 'release-candidate' into stable
2019-10-28 andrewoverton@google.com Merge branch 'release-candidate' into stable
2019-10-25 rsmoore@google.com Merge branch 'release-candidate' into stable
2019-10-23 andrewoverton@google.com Merge branch 'release-candidate' into stable
2019-10-21 rsmoore@google.com Merge branch 'release-candidate' into stable
2019-10-16 andrewoverton@google.com Merge branch 'release-candidate' into stable
2019-10-09 yarneo@gmail.com Merge branch 'release-candidate' into stable
2019-10-08 yarneo@gmail.com Merge branch 'release-candidate' into stable
2019-10-07 featherless@google.com Merge branch 'release-candidate' into stable
2019-10-04 randallli@randallli-macbookpro2.roam.corp.google.com Merge branch 'release-candidate' into stable
2019-09-24 rsmoore@google.com Merge branch 'release-candidate' into stable
2019-09-23 randallli@google.com Merge branch 'release-candidate' into stable
2019-09-20 wenyuz@google.com Merge branch 'release-candidate' into stable
2019-09-19 bryanoltman@google.com Merge branch 'release-candidate' into stable

Change-Id: I159aabff99fcfc7037cf51f431b4d858ca233437
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940173Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719973}
parent 8d9034f1
...@@ -526,7 +526,7 @@ deps = { ...@@ -526,7 +526,7 @@ deps = {
}, },
'src/ios/third_party/material_components_ios/src': { 'src/ios/third_party/material_components_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '8e8b719e061c1f3a6c214fea4ab90aad0e980d4e', 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '4695792710cf8c9e5b0627f7240c831482c3db37',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
......
...@@ -29,7 +29,10 @@ copy("mdc_components_ios_public_headers") { ...@@ -29,7 +29,10 @@ copy("mdc_components_ios_public_headers") {
"src/components/Typography/src/MaterialTypography.h", "src/components/Typography/src/MaterialTypography.h",
"src/components/schemes/Color/src/MaterialColorScheme.h", "src/components/schemes/Color/src/MaterialColorScheme.h",
"src/components/schemes/Shape/src/MaterialShapeScheme.h", "src/components/schemes/Shape/src/MaterialShapeScheme.h",
"src/components/schemes/Typography/src/BasicFontScheme/MDCBasicFontScheme.h",
"src/components/schemes/Typography/src/BasicFontScheme/MaterialTypographyScheme+BasicFontScheme.h",
"src/components/schemes/Typography/src/MaterialTypographyScheme.h", "src/components/schemes/Typography/src/MaterialTypographyScheme.h",
"src/components/schemes/Typography/src/Scheming/MaterialTypographyScheme+Scheming.h",
] ]
outputs = [ outputs = [
"$root_gen_dir/frameworks/material_components_ios/MaterialComponents/{{source_file_part}}", "$root_gen_dir/frameworks/material_components_ios/MaterialComponents/{{source_file_part}}",
...@@ -76,6 +79,7 @@ config("config") { ...@@ -76,6 +79,7 @@ config("config") {
"src/components/schemes/Container/src/", "src/components/schemes/Container/src/",
"src/components/schemes/Shape/src", "src/components/schemes/Shape/src",
"src/components/schemes/Typography/src", "src/components/schemes/Typography/src",
"src/components/schemes/Typography/src/Scheming",
] ]
} }
...@@ -97,8 +101,6 @@ _icon_names = [ ...@@ -97,8 +101,6 @@ _icon_names = [
source_set("material_components_ios") { source_set("material_components_ios") {
sources = [ sources = [
"src/components/ActivityIndicator/src/ColorThemer/MDCActivityIndicatorColorThemer.h",
"src/components/ActivityIndicator/src/ColorThemer/MDCActivityIndicatorColorThemer.m",
"src/components/ActivityIndicator/src/MDCActivityIndicator.h", "src/components/ActivityIndicator/src/MDCActivityIndicator.h",
"src/components/ActivityIndicator/src/MDCActivityIndicator.m", "src/components/ActivityIndicator/src/MDCActivityIndicator.m",
"src/components/ActivityIndicator/src/MaterialActivityIndicator.h", "src/components/ActivityIndicator/src/MaterialActivityIndicator.h",
...@@ -449,11 +451,14 @@ source_set("material_components_ios") { ...@@ -449,11 +451,14 @@ source_set("material_components_ios") {
"src/components/schemes/Shape/src/MDCShapeCategory.m", "src/components/schemes/Shape/src/MDCShapeCategory.m",
"src/components/schemes/Shape/src/MDCShapeScheme.h", "src/components/schemes/Shape/src/MDCShapeScheme.h",
"src/components/schemes/Shape/src/MDCShapeScheme.m", "src/components/schemes/Shape/src/MDCShapeScheme.m",
"src/components/schemes/Typography/src/MDCLegacyFontScheme.h", "src/components/schemes/Typography/src/BasicFontScheme/MDCBasicFontScheme.h",
"src/components/schemes/Typography/src/MDCLegacyFontScheme.m", "src/components/schemes/Typography/src/BasicFontScheme/MDCBasicFontScheme.m",
"src/components/schemes/Typography/src/BasicFontScheme/MaterialTypographyScheme+BasicFontScheme.h",
"src/components/schemes/Typography/src/MDCTypographyScheme.h", "src/components/schemes/Typography/src/MDCTypographyScheme.h",
"src/components/schemes/Typography/src/MDCTypographyScheme.m", "src/components/schemes/Typography/src/MDCTypographyScheme.m",
"src/components/schemes/Typography/src/MaterialTypographyScheme.h", "src/components/schemes/Typography/src/MaterialTypographyScheme.h",
"src/components/schemes/Typography/src/Scheming/MDCTypographyScheming.h",
"src/components/schemes/Typography/src/Scheming/MaterialTypographyScheme+Scheming.h",
] ]
include_dirs = [ include_dirs = [
"src/components/ActivityIndicator/src", "src/components/ActivityIndicator/src",
...@@ -492,6 +497,7 @@ source_set("material_components_ios") { ...@@ -492,6 +497,7 @@ source_set("material_components_ios") {
"CoreText.framework", "CoreText.framework",
"QuartzCore.framework", "QuartzCore.framework",
"UIKit.framework", "UIKit.framework",
"WebKit.framework",
] ]
deps = [ deps = [
......
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