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

Upgrade Engine Android SDK to 35 #53574

Merged
merged 34 commits into from
Jul 24, 2024
Merged

Upgrade Engine Android SDK to 35 #53574

merged 34 commits into from
Jul 24, 2024

Conversation

camsim99
Copy link
Contributor

@camsim99 camsim99 commented Jun 25, 2024

REVIEW BUT DO NOT MERGE: Will merge after flutter/buildroot#870 lands.

1: Updates engine to use Android 35. Part of flutter/flutter#150215.
Engine step of https://github.com/flutter/flutter/blob/master/docs/platforms/android/Upgrading-Engine's-Android-API-version.md.

2: Updates test runner AGP version to 8.5, engine Gradle version to 8.9 to accommodate update.

3: Fixes lint and suppresses deprecation warnings caused by the update. None of the deprecations are unknown by the team (they are handled in the code), but the tests emitted warnings.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C , Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

@camsim99 camsim99 changed the title Upgrade Android SDK to35 Upgrade Android SDK to 35 Jul 1, 2024
@camsim99 camsim99 mentioned this pull request Jul 18, 2024
8 tasks
@camsim99
Copy link
Contributor Author

Failures seem unrelated? Submitting for review

@camsim99 camsim99 marked this pull request as ready for review July 18, 2024 21:44
@camsim99 camsim99 requested a review from a team July 18, 2024 21:44
Copy link
Member

@gmackall gmackall left a comment

Choose a reason for hiding this comment

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

Changes lgtm (as long as the pointing to fork for test purpose is removed) - total guess but are these test failures related to the buildmoot effort?

Creating file ./src/flutter/GeneratedPluginRegistrant.java
PASS: ban_generated_plugin_registrant_java failed as expected
Creating file ./src/third_party/GeneratedPluginRegistrant.java
touch: cannot touch '/b/s/w/ir/cache/builder/src/third_party/GeneratedPluginRegistrant.java': No such file or directory

I believe at some point recently the src/third_party directory had reached uselessness (everything migrated out), perhaps the test needs to be changed to not try to create a file in that directory?

touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java"

cc @matanlurey

@reidbaker
Copy link
Contributor

I believe at some point recently the src/third_party directory had reached uselessness (everything migrated out), perhaps the test needs to be changed to not try to create a file in that directory?

Removed this test case because I believe it was just testing for accidentally putting that GeneratedPluginRegistrant file in the third_party directory, which should not be possible anymore based on that test failure/buildmoot stuff? Correct me if I'm wrong.

It is still valuable but the relative location of the directory changed. I think this should be an updated not removed test.

@camsim99
Copy link
Contributor Author

Landing this buildroot changed blocked by flutter/flutter#152177.

auto-submit bot pushed a commit to flutter/buildroot that referenced this pull request Jul 23, 2024
**DO NOT LAND YET:** Please review flutter/engine#53574 first; will merge this once it is approved.

Change engine to use Android 15.

Buildroot step of https://github.com/flutter/flutter/blob/master/docs/platforms/android/Upgrading-Engine's-Android-API-version.md to complete flutter/flutter#150215.
@camsim99 camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2024
@auto-submit auto-submit bot merged commit 5d0e134 into flutter:main Jul 24, 2024
33 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jul 24, 2024
…152260)

flutter/engine@490576d...c2f489d

2024-07-24 [email protected] Fix embedder comments about struct_size (flutter/engine#54077)
2024-07-24 [email protected] share platform view slicing logic across iOS and Android. (flutter/engine#54010)
2024-07-24 [email protected] [skwasm] Fix platform view occlusion logic. (flutter/engine#54061)
2024-07-24 [email protected] Roll Skia from 25f26f673502 to c11932925658 (4 revisions) (flutter/engine#54081)
2024-07-24 43054281 [email protected] Upgrade Engine Android SDK to 35 (flutter/engine#53574)
2024-07-24 [email protected] Roll Skia from a9b1043eb23e to 25f26f673502 (1 revision) (flutter/engine#54079)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/ doc/main/autoroll/README.md
auto-submit bot pushed a commit that referenced this pull request Aug 5, 2024
Updates/corrects steps to update Gradle version used in the engine based on what @gmackall and I did to update the engine's Gradle version in #53574.
 
[C  , Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
TytaniumDev pushed a commit to TytaniumDev/flutter that referenced this pull request Aug 7, 2024
…lutter#152260)

flutter/engine@490576d...c2f489d

2024-07-24 [email protected] Fix embedder comments about struct_size (flutter/engine#54077)
2024-07-24 [email protected] share platform view slicing logic across iOS and Android. (flutter/engine#54010)
2024-07-24 [email protected] [skwasm] Fix platform view occlusion logic. (flutter/engine#54061)
2024-07-24 [email protected] Roll Skia from 25f26f673502 to c11932925658 (4 revisions) (flutter/engine#54081)
2024-07-24 43054281 [email protected] Upgrade Engine Android SDK to 35 (flutter/engine#53574)
2024-07-24 [email protected] Roll Skia from a9b1043eb23e to 25f26f673502 (1 revision) (flutter/engine#54079)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/ doc/main/autoroll/README.md
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Aug 14, 2024
Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574   general cleanup.
DBowen33 pushed a commit to DBowen33/flutter that referenced this pull request Aug 16, 2024
Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574   general cleanup.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App platform-android
Projects
None yet
3 participants