Skip to content

Commit

Permalink
Revert "[iOS] Roll MDC to dc9529ad1077730cb7a57b05b77c9260d027b6d4"
Browse files Browse the repository at this point in the history
This reverts commit 1961979.

Reason for revert: Breaks official builder as the followup
downstream CL cannot land. Reverting until the downstream
situation can be fixed.

Original change's description:
> [iOS] Roll MDC to dc9529ad1077730cb7a57b05b77c9260d027b6d4
> 
> Bug: 1034144
> Change-Id: I8f69bae933c264839a60f4ce7c9cb6ac04249895
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003391
> Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#732628}

TBR=eugenebut@chromium.org,kkhorimoto@chromium.org

Change-Id: I38a5bd99b76a22ff2a43a9d36ede6a7be2aedb54
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1034144
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007448
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732807}
  • Loading branch information
sdefresne authored and Commit Bot committed Jan 17, 2020
1 parent 4373636 commit c68a814
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ deps = {
},

'src/ios/third_party/material_components_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'dc9529ad1077730cb7a57b05b77c9260d027b6d4',
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'c2500e4ea9dc2b99a080df244247abaae061a198',
'condition': 'checkout_ios',
},

Expand Down
11 changes: 8 additions & 3 deletions ios/third_party/material_components_ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ _mdc_public_headers = [
# $ cd src/ios/third_party/material_components_ios
# $ find src -path 'src/components/*/src/*.h' -a \! -path '*Test*'|\
# sed -e 's:\(.*\): "\1",:'|sort -u
"src/components/private/Application/src/UIApplication+MDCAppExtensions.h",
"src/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h",
"src/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetThemer.h",
"src/components/ActionSheet/src/ActionSheetThemer/MaterialActionSheet+ActionSheetThemer.h",
Expand Down Expand Up @@ -194,6 +193,8 @@ _mdc_public_headers = [
"src/components/FeatureHighlight/src/private/MDCFeatureHighlightView+Private.h",
"src/components/FlexibleHeader/src/CanAlwaysExpandToMaximumHeight/MDCFlexibleHeaderView+canAlwaysExpandToMaximumHeight.h",
"src/components/FlexibleHeader/src/CanAlwaysExpandToMaximumHeight/MaterialFlexibleHeader+CanAlwaysExpandToMaximumHeight.h",
"src/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h",
"src/components/FlexibleHeader/src/ColorThemer/MaterialFlexibleHeader+ColorThemer.h",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderView+ShiftBehavior.h",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderView.h",
Expand Down Expand Up @@ -416,6 +417,7 @@ _mdc_public_headers = [
"src/components/Typography/src/private/MDCTypographyUtilities.h",
"src/components/Typography/src/private/UIFont+MaterialTypographyPrivate.h",
"src/components/private/Application/src/MaterialApplication.h",
"src/components/private/Application/src/UIApplication+AppExtensions.h",
"src/components/private/Beta/src/MaterialBetaComponent.h",
"src/components/private/Color/src/MaterialColor.h",
"src/components/private/Color/src/UIColor+MaterialBlending.h",
Expand Down Expand Up @@ -985,6 +987,9 @@ target(_mdc_target_type, "material_components_ios") {
"src/components/FeatureHighlight/src/private/MDCFeatureHighlightView+Private.m",
"src/components/FlexibleHeader/src/CanAlwaysExpandToMaximumHeight/MDCFlexibleHeaderView+canAlwaysExpandToMaximumHeight.h",
"src/components/FlexibleHeader/src/CanAlwaysExpandToMaximumHeight/MaterialFlexibleHeader+CanAlwaysExpandToMaximumHeight.h",
"src/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h",
"src/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.m",
"src/components/FlexibleHeader/src/ColorThemer/MaterialFlexibleHeader+ColorThemer.h",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.m",
"src/components/FlexibleHeader/src/MDCFlexibleHeaderView+ShiftBehavior.h",
Expand Down Expand Up @@ -1337,8 +1342,8 @@ target(_mdc_target_type, "material_components_ios") {
"src/components/Typography/src/private/UIFont+MaterialTypographyPrivate.h",
"src/components/Typography/src/private/UIFont+MaterialTypographyPrivate.m",
"src/components/private/Application/src/MaterialApplication.h",
"src/components/private/Application/src/UIApplication+MDCAppExtensions.h",
"src/components/private/Application/src/UIApplication+MDCAppExtensions.m",
"src/components/private/Application/src/UIApplication+AppExtensions.h",
"src/components/private/Application/src/UIApplication+AppExtensions.m",
"src/components/private/Beta/src/MaterialBetaComponent.h",
"src/components/private/Color/src/MaterialColor.h",
"src/components/private/Color/src/UIColor+MaterialBlending.h",
Expand Down

0 comments on commit c68a814

Please sign in to comment.