Upgrade Engine Android SDK to 35 #53574

camsim99 · 2024-06-25T22:45:22Z

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 · 2024-07-18T21:44:29Z

Failures seem unrelated? Submitting for review

gmackall

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?

engine/ci/test/ban_generated_plugin_registrant_java_test.sh

Line 63 in 312b519

touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java"

cc @matanlurey

camsim99 · 2024-07-23T18:02:55Z

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

**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.

…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 [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

@gmackall

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

…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 [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

Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574 + general cleanup.

…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 [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

Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574 + general cleanup.

Make base engine changes

03266f1

github-actions bot added the platform-android label Jun 25, 2024

camsim99 added 3 commits June 28, 2024 09:43

Merge remote-tracking branch 'upstream/main' into eng_35

10e169b

Correct 35 version

7ca603d

compileSdk

8c0e538

camsim99 changed the title ~~Upgrade Android SDK to35~~ Upgrade Android SDK to 35 Jul 1, 2024

camsim99 added 18 commits July 1, 2024 09:15

Undo packages + change for test

291cb41

format

65d90a9

Change back to 35

e317ce4

format

5ce0a8d

Test with buildroot changes

9b01ee7

Update 35 version to 35v1

3e09995

Update impeller test

7ff2d27

Correct Imepller version

b530500

Test correct root

35265f8

Another impeller update

380766e

Correct build tools version

a9b171c

Bump target version

d5963e2

Bump test runner AGP version

ea34633

bump manifest target

380d49d

deps

5961681

Suppress deprecations

32339a9

Undo added code

1f07cd8

Merge remote-tracking branch 'upstream/main' into eng_35

1aec7b3

camsim99 mentioned this pull request Jul 18, 2024

Bump to Android 35 flutter/buildroot#870

Merged

8 tasks

Merge remote-tracking branch 'upstream/main' into eng_35

a8e44ac

camsim99 marked this pull request as ready for review July 18, 2024 21:44

camsim99 requested a review from a team July 18, 2024 21:44

gmackall approved these changes Jul 18, 2024

View reviewed changes

camsim99 and others added 5 commits July 22, 2024 10:13

Correct directory

53ee46d

Merge remote-tracking branch 'upstream/main' into eng_35

ca1611b

Merge branch 'main' into eng_35

8edba5f

Update buildroot commit

7fecb2a

Merge remote-tracking branch 'refs/remotes/origin/eng_35' into eng_35

ff12cf4

camsim99 mentioned this pull request Jul 23, 2024

Flutter engine presubmit Linux linux_web_engine fails with code = InvalidArgument desc = build.summary_markdown: too big to accept (6555 > 4000 bytes) flutter/flutter#152177

Closed

camsim99 added 2 commits July 23, 2024 14:28

Merge remote-tracking branch 'upstream/main' into eng_35

7d37adc

Temporarily undo deps change

7adc7b8

Update DEPS entry

1635d85

reidbaker approved these changes Jul 24, 2024

View reviewed changes

camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2024

auto-submit bot merged commit 5d0e134 into flutter:main Jul 24, 2024
33 checks passed

engine-flutter-autoroll mentioned this pull request Jul 24, 2024

Roll Flutter Engine from 490576daf810 to 5d0e1347eaea (2 revisions) flutter/flutter#152250

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024

5d0e1347e Upgrade Engine Android SDK to 35 (flutter/engine#53574)

078b7e7

engine-flutter-autoroll mentioned this pull request Jul 24, 2024

Roll Flutter Engine from 490576daf810 to 2b2545908552 (3 revisions) flutter/flutter#152252

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024

5d0e1347e Upgrade Engine Android SDK to 35 (flutter/engine#53574)

23128d6

engine-flutter-autoroll mentioned this pull request Jul 24, 2024

Roll Flutter Engine from 490576daf810 to c2f489d783d6 (6 revisions) flutter/flutter#152260

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024

5d0e1347e Upgrade Engine Android SDK to 35 (flutter/engine#53574)

d94ba51

camsim99 mentioned this pull request Jul 31, 2024

Update docs to use new Gradle version in the engine #53964

Merged

8 tasks

This was referenced Aug 13, 2024

[Android] Build the engine against Android 35 flutter/flutter#150215

Closed

Update docs to use new Android version in the engine flutter/flutter#151601

Merged

auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Aug 14, 2024

Update docs to use new Android version in the engine (#151601)

f697d61

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

Update docs to use new Android version in the engine (flutter#151601)

148a243

Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574 + general cleanup.

Buchimi pushed a commit to Buchimi/flutter that referenced this pull request Sep 2, 2024

Update docs to use new Android version in the engine (flutter#151601)

52b6ef2

Updates the steps based on what I found by working on flutter/engine#54186 and flutter/engine#53574 + general cleanup.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade Engine Android SDK to 35 #53574

Upgrade Engine Android SDK to 35 #53574

camsim99 commented Jun 25, 2024 •

edited

Loading

camsim99 commented Jul 18, 2024

gmackall left a comment •

edited

Loading

camsim99 commented Jul 23, 2024

Upgrade Engine Android SDK to 35 #53574

Upgrade Engine Android SDK to 35 #53574

Conversation

camsim99 commented Jun 25, 2024 • edited Loading

Pre-launch Checklist

camsim99 commented Jul 18, 2024

gmackall left a comment • edited Loading

Choose a reason for hiding this comment

camsim99 commented Jul 23, 2024

camsim99 commented Jun 25, 2024 •

edited

Loading

gmackall left a comment •

edited

Loading