Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rolls engine to Android SDK 29 and its corresponding tools #10692

Merged
merged 3 commits into from Aug 7, 2019

Conversation

shihaohong
Copy link

Updates the engine's Android SDK and tool versions to the buildroot's latest version. This unblocks the buildroot roll by updating the engine's Android SDK and related tools, since it may take some time before #10413 lands.

For all associated CIPD changes, see https://chrome-infra-packages.appspot.com/p/flutter/android/sdk

@stuartmorgan
Copy link
Contributor

We need to land flutter/buildroot#294 so you can roll to that in this patch; my attempted fix last night didn't end up working, so rolling to the current ToT will break Windows again.

@dnfield
Copy link
Contributor

dnfield commented Aug 7, 2019

Looks like Javadoc is failing on this - does it pass locally?

@shihaohong
Copy link
Author

@dnfield I also just noticed -- I forgot to make changes to two files from android-28 to android-29 in the code.

@shihaohong shihaohong added the Work in progress (WIP) Not ready (yet) for review! label Aug 7, 2019
@shihaohong
Copy link
Author

I just made the changes, but we still need to wait for flutter/buildroot#294 to land and then roll the buildroot to that patch

Copy link
Contributor

@dnfield dnfield left a comment

Choose a reason for hiding this comment

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

LGTM

I think this is a better way to land it anyway, so that we can identify regressions independent of other changes. Thanks for doing this.

DEPS Outdated
@@ -137,7 +137,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'c6bd1f1e25048a97d99cf2fa679bd54ebad94697',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '07d0e2668a491a67197d569d4e6a724d3191bdd1',
Copy link
Contributor

Choose a reason for hiding this comment

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

@shihaohong shihaohong removed the Work in progress (WIP) Not ready (yet) for review! label Aug 7, 2019
@shihaohong shihaohong merged commit 797f032 into flutter:master Aug 7, 2019
shihaohong pushed a commit that referenced this pull request Aug 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 7, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Aug 7, 2019
git@github.com:flutter/engine.git/compare/dac86eb7fbf7...81f695f

git log dac86eb..81f695f --no-merges --oneline
2019-08-07 bkonyi@google.com Roll src/third_party/dart f3139f57b4..f29f41f1a5 (3 commits) (flutter/engine#10693)
2019-08-07 shihaohong@google.com Roll buildroot forward to unbreak ToT (flutter/engine#10694)
2019-08-07 shihaohong@google.com Rolls engine to Android SDK 29 and its corresponding tools (flutter/engine#10692)
2019-08-07 goderbauer@google.com Fix empty composing range on iOS (flutter/engine#10381)
2019-08-07 skia-flutter-autoroll@skia.org Roll src/third_party/skia ed19e97294f6..593290ed75fd (2 commits) (flutter/engine#10691)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff (jimgraham@google.com), and stop
the roller if necessary.
cyanglaz pushed a commit to cyanglaz/engine that referenced this pull request Aug 16, 2019
…0692)

* Rolls engine to Android SDK 29 and its corresponding tools

* Update from android-28 to android-29 in relevant files

* Roll buildroot to tip of tree
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants