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

Disable Impeller when the manifest explicitly disables it #53108

Merged
merged 1 commit into from
May 30, 2024

Conversation

jiahaog
Copy link
Member

@jiahaog jiahaog commented May 30, 2024

After #53099, impeller is always enabled, even if the manifest disables it using io.flutter.embedding.android.EnableImpeller.

This PR causes it to respect the manifest value if it is explicitly disabled.

Fixes b/343603270

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.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Copy link
Member

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM

@jonahwilliams jonahwilliams added the autosubmit Merge PR when tree becomes green via auto submit App label May 30, 2024
@auto-submit auto-submit bot merged commit 8da25dc into flutter:main May 30, 2024
29 checks passed
@zanderso
Copy link
Member

It looks like there are unit tests around the flag value and default value around https://github.com/flutter/engine/blob/main/shell/platform/android/test/io/flutter/embedding/engine/loader/FlutterLoaderTest.java#L162. Could this PR have had a unit test?

@jonahwilliams
Copy link
Member

This is failing the external textures test: https://ci.chromium.org/ui/p/flutter/builders/try/Linux_android_emu%20external_textures_integration_test/1422/overview

reason for revert: Probably --no-enable-impeller isn't working

@jonahwilliams jonahwilliams added the revert Label used to revert changes in a closed and merged pull request. label May 30, 2024
auto-submit bot pushed a commit that referenced this pull request May 30, 2024
@auto-submit auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label May 30, 2024
auto-submit bot added a commit that referenced this pull request May 30, 2024
…53108)" (#53124)

Reverts: #53108
Initiated by: jonahwilliams
Reason for reverting: Probably --no-enable-impeller isn't working
Original PR Author: jiahaog

Reviewed By: {jonahwilliams}

This change reverts the following previous change:
After #53099, impeller is always enabled, even if the manifest disables it using `io.flutter.embedding.android.EnableImpeller`. 

This PR causes it to respect the manifest value if it is explicitly disabled.

Fixes b/343603270

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
chingjun pushed a commit to engine-flutter-autoroll/flutter that referenced this pull request May 30, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 30, 2024
…149357)

flutter/engine@de07179...bf2e32d

2024-05-30 flar@google.com DisplayList SaveLayer (and root layer) read-back flags (flutter/engine#53104)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 7cfb0898ac15 to 188ad395c3e7 (2 revisions) (flutter/engine#53127)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from ef405fbe3917 to 2976c1694eed (6 revisions) (#53119)" (flutter/engine#53128)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 75cf7d351b02 to 7cfb0898ac15 (3 revisions) (flutter/engine#53126)
2024-05-30 jonnywang@google.com Fuchsia api level 18 (flutter/engine#53115)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Impeller] enable Impeller by default on Android. (#53099)" (flutter/engine#53125)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Disable Impeller when the manifest explicitly disables it (#53108)" (flutter/engine#53124)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from eadc654480ed to 75cf7d351b02 (2 revisions) (flutter/engine#53120)
2024-05-30 skia-flutter-autoroll@skia.org Roll Dart SDK from ef405fbe3917 to 2976c1694eed (6 revisions) (flutter/engine#53119)
2024-05-30 yjbanov@google.com add SemanticsAction.focus (flutter/engine#53094)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 693d9362f0f6 to eadc654480ed (3 revisions) (flutter/engine#53117)
2024-05-30 bdero@google.com [Flutter GPU] Upload `flutter_gpu.zip` upon successful completion of ci/android_debug. (flutter/engine#53107)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 949b8cefbf87 to 693d9362f0f6 (2 revisions) (flutter/engine#53114)
2024-05-30 jiahaog@users.noreply.github.com Disable Impeller when the manifest explicitly disables it (flutter/engine#53108)

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 jacksongardner@google.com,rmistry@google.com,zra@google.com 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
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request May 31, 2024
…lutter#149357)

flutter/engine@de07179...bf2e32d

2024-05-30 flar@google.com DisplayList SaveLayer (and root layer) read-back flags (flutter/engine#53104)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 7cfb0898ac15 to 188ad395c3e7 (2 revisions) (flutter/engine#53127)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from ef405fbe3917 to 2976c1694eed (6 revisions) (flutter#53119)" (flutter/engine#53128)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 75cf7d351b02 to 7cfb0898ac15 (3 revisions) (flutter/engine#53126)
2024-05-30 jonnywang@google.com Fuchsia api level 18 (flutter/engine#53115)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Impeller] enable Impeller by default on Android. (flutter#53099)" (flutter/engine#53125)
2024-05-30 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Disable Impeller when the manifest explicitly disables it (flutter#53108)" (flutter/engine#53124)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from eadc654480ed to 75cf7d351b02 (2 revisions) (flutter/engine#53120)
2024-05-30 skia-flutter-autoroll@skia.org Roll Dart SDK from ef405fbe3917 to 2976c1694eed (6 revisions) (flutter/engine#53119)
2024-05-30 yjbanov@google.com add SemanticsAction.focus (flutter/engine#53094)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 693d9362f0f6 to eadc654480ed (3 revisions) (flutter/engine#53117)
2024-05-30 bdero@google.com [Flutter GPU] Upload `flutter_gpu.zip` upon successful completion of ci/android_debug. (flutter/engine#53107)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 949b8cefbf87 to 693d9362f0f6 (2 revisions) (flutter/engine#53114)
2024-05-30 jiahaog@users.noreply.github.com Disable Impeller when the manifest explicitly disables it (flutter/engine#53108)

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 jacksongardner@google.com,rmistry@google.com,zra@google.com 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
@jiahaog jiahaog deleted the enable-impeller-disable branch July 22, 2024 07:38
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
Development

Successfully merging this pull request may close these issues.

3 participants