Skip to content

[flutter_tools] support new SDK structure for sdkmanager (#51980) - #53194

Merged
jonahwilliams merged 1 commit into
flutter:v1.12.13-hotfixesfrom
jonahwilliams:v1.12.13-hotfixes
Mar 25, 2020
Merged

[flutter_tools] support new SDK structure for sdkmanager (#51980)#53194
jonahwilliams merged 1 commit into
flutter:v1.12.13-hotfixesfrom
jonahwilliams:v1.12.13-hotfixes

Conversation

@jonahwilliams

@jonahwilliams jonahwilliams commented Mar 24, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Teach the android SDK class about the cmdline tools, which accept licenses instead of the obsolete platform tools.

We're not currently able to accept android licenses in the latest SDK. We also need to update our documentation to explain which component to download.

#51712

@fluttergithubbot
fluttergithubbot changed the base branch from v1.12.13-hotfixes to master March 24, 2020 20:43
@fluttergithubbot

fluttergithubbot commented Mar 24, 2020

Copy link
Copy Markdown
Contributor

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to v1.12.13-hotfixes. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master. The circumstances where this is valid are very rare.

/cc @dnfield

@fluttergithubbot fluttergithubbot added engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Mar 24, 2020
@jonahwilliams
jonahwilliams changed the base branch from master to v1.12.13-hotfixes March 24, 2020 20:43
@jonahwilliams

jonahwilliams commented Mar 24, 2020

Copy link
Copy Markdown
Contributor Author

All tests passed: https://cirrus-ci.com/build/6288285488119808

@pcsosinski

pcsosinski commented Mar 24, 2020

Copy link
Copy Markdown

where were the conflicts you had to change? can one of the engineers who LGTM'd the original PR take a look as well?

@jonahwilliams

jonahwilliams commented Mar 24, 2020

Copy link
Copy Markdown
Contributor Author

The conflicts had to do with the addition of the globals. import prefix to distinguish the DI injected values. There were no other changes adding @jmagman and @christopherfujino for additional review

@jonahwilliams

jonahwilliams commented Mar 24, 2020

Copy link
Copy Markdown
Contributor Author

For reference here is the original change: https://github.com/flutter/flutter/pull/51980/files

christopherfujino
christopherfujino approved these changes Mar 24, 2020
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jmagman
jmagman approved these changes Mar 24, 2020
View reviewed changes

@jmagman jmagman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jonahwilliams
jonahwilliams merged commit b59b226 into flutter:v1.12.13-hotfixes Mar 25, 2020
@jonahwilliams
jonahwilliams deleted the v1.12.13-hotfixes branch March 25, 2020 02:01
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Aug 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jmagman jmagman jmagman approved these changes
@tvolkert tvolkert Awaiting requested review from tvolkert
+2 more reviewers
@christopherfujino christopherfujino christopherfujino approved these changes
@pcsosinski pcsosinski pcsosinski approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jonahwilliams @fluttergithubbot @pcsosinski @jmagman @christopherfujino @googlebot