Remove embedding v1 code in framework #144726

gmackall · 2024-03-06T21:59:35Z

Pre work for flutter/engine#51229. Removes a lot of code referencing v1 of the android embedding, though not necessarily all of it (I may have missed some, it is hard to know).

Will hopefully make landing that PR less painful (or maybe painless?)

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, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

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

gmackall · 2024-03-06T22:02:29Z

packages/flutter_tools/lib/src/flutter_plugins.dart

-      return;
-    }
-{{#methodChannelPlugins}}
-    {{class}}.registerWith(registry.registrarFor("{{package}}.{{class}}"));


Interesting that this is where the lint in https://discord.com/channels/608014603317936148/846507907876257822/1214337088657293333 was coming from

gmackall · 2024-03-06T23:07:38Z

packages/flutter_tools/lib/src/project.dart

+    // better way. This is just to simulate it so I can hunt down tests to
+    // modify or delete.
+    throwToolExit(
+      'Build failed due to use of deleted Android v1 embedding.',


This change and the other one should NOT land. They are just to simulate the v1 embedding being deleted, to help me track down tests that need to be fixed or removed.

Noting after merging for anyone who comes across this pr in search: leaving this exit in place (this is likely the first failure point we will hit for someone trying to build a v1 embedding app, and it is good to have a clear message)

gmackall · 2024-03-06T23:07:50Z

packages/flutter_tools/lib/src/project.dart

      throwToolExit(
-        'Build failed due to use of deprecated Android v1 embedding.',
+        'Build failed due to use of deleted Android v1 embedding.',


The other one

gmackall · 2024-03-12T17:03:00Z

packages/flutter_tools/test/commands.shard/hermetic/pub_test.dart

@@ -16,6 +16,17 @@ import 'package:test/fake.dart';
 import '../../src/context.dart';
 import '../../src/test_flutter_command_runner.dart';

+const String minimalV2EmbeddingManifest = r'''


I added this to make the these pub get tests report v2 embedding, instead of v1, because the tests themselves were largely unrelated to testing android embedding behavior and thus it didn't make sense to delete them.

But I don't really know why running pub get should be at all linked to the android embedding version? I don't know why we compute and return the android embedding version here.

Seems maybe analytics related, in which case it would also be a good candidate for removal (Not the test, but the behavior of linking the android embedding version to pub get here). We don't need analytics for deleted code.

It does indeed look like this was analytics related: #44043

I removed what I could of the analytics, and therefore also the changes to this test (it now works with no new manifest file, original comment in this thread is outdated). Some pieces of it, like this Event class, are not part of the flutter repo? I don't know where they are defined or what the process for removing the embedding version from that class would be like.

Noting after merging for anyone who comes across this pr in search: I decided to not delete the analytics, as we will probably have a v3 embedding one day

…st from v1 name to v2 name

This reverts commit 4c99995.

This reverts commit 31f3c7c.

gmackall · 2024-03-20T19:20:14Z

This will likely break in post submit, but we will work through those failures if/when they happen

auto-submit · 2024-03-20T19:23:58Z

auto label is removed for flutter/flutter/144726, due to - The status or check suite Mac tool_tests_general has failed. Please fix the issues identified (or deflake) before re-applying this label.

This reverts commit dbfc570.

flutter/flutter@b96c13d...18340ea 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7cdb240c4a16 to bad4a30e1c75 (2 revisions) (flutter/flutter#145551) 2024-03-21 engine-flutter-autoroll@skia.org Roll Packages from 23e56af to b7fbe68 (3 revisions) (flutter/flutter#145547) 2024-03-21 pascal@welsch.dev Add WidgetsApp.debugShowWidgetInspectorOverride again (deprecated) (flutter/flutter#145334) 2024-03-21 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll pub packages (#145509)" (flutter/flutter#145550) 2024-03-21 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#145509) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 14b67475cf80 to 7cdb240c4a16 (1 revision) (flutter/flutter#145533) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6de3d9b6196a to 14b67475cf80 (1 revision) (flutter/flutter#145529) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from c0d3ac3178fa to 6de3d9b6196a (1 revision) (flutter/flutter#145520) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 23dc0cacc4db to c0d3ac3178fa (1 revision) (flutter/flutter#145519) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from a73e01364de0 to 23dc0cacc4db (2 revisions) (flutter/flutter#145517) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 45ed36c17bb7 to a73e01364de0 (1 revision) (flutter/flutter#145516) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 34b304a27f73 to 45ed36c17bb7 (1 revision) (flutter/flutter#145513) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 912c61f30512 to 34b304a27f73 (1 revision) (flutter/flutter#145511) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 98cfd9213332 to 912c61f30512 (1 revision) (flutter/flutter#145504) 2024-03-21 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#145476) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from fe6927c79dc3 to 98cfd9213332 (1 revision) (flutter/flutter#145498) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from d1fe8994dedf to fe6927c79dc3 (1 revision) (flutter/flutter#145493) 2024-03-20 bhesaniyavatsal@gmail.com Add helper widget parameter to InputDecoration (flutter/flutter#145157) 2024-03-20 34871572+gmackall@users.noreply.github.com Remove embedding v1 code in framework (flutter/flutter#144726) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from 1b52f57ca07c to d1fe8994dedf (8 revisions) (flutter/flutter#145491) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from f803f2adec54 to 1b52f57ca07c (1 revision) (flutter/flutter#145479) 2024-03-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reland #128236 "Improve build output for all platforms" (#145376)" (flutter/flutter#145487) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from fc2b7a9076b4 to f803f2adec54 (1 revision) (flutter/flutter#145475) 2024-03-20 6655696+guidezpl@users.noreply.github.com Reland #128236 "Improve build output for all platforms" (flutter/flutter#145376) 2024-03-20 engine-flutter-autoroll@skia.org Roll Packages from a2f4ce0 to 23e56af (5 revisions) (flutter/flutter#145470) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from 883adfe2ef61 to fc2b7a9076b4 (1 revision) (flutter/flutter#145469) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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

Reverts: #51229 Initiated by: gmackall Reason for reverting: blocking engine->framework roll (I missed some framework code referencing the v1 embedding). Original PR Author: gmackall Reviewed By: {matanlurey, reidbaker} This change reverts the following previous change: Fixes flutter/flutter#143531 Also fixes a random typo I found ~TODO to test this~ (no more todo): -~test the framework against this as well, probably with a dummy PR changing the engine commit to my branch if this is possible~ not possible, made a best effort removal of framework code in flutter/flutter#144726. -~figure out if the old embedding is used in g3 at all~ removed all uses -~figure out exactly what the ShimPluginRegistry/ShimRegistrar are doing, and if fully deleting them was right~ (see #51229 (comment)) [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

…r#6370) flutter/flutter@b96c13d...18340ea 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7cdb240c4a16 to bad4a30e1c75 (2 revisions) (flutter/flutter#145551) 2024-03-21 engine-flutter-autoroll@skia.org Roll Packages from 23e56af to b7fbe68 (3 revisions) (flutter/flutter#145547) 2024-03-21 pascal@welsch.dev Add WidgetsApp.debugShowWidgetInspectorOverride again (deprecated) (flutter/flutter#145334) 2024-03-21 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll pub packages (#145509)" (flutter/flutter#145550) 2024-03-21 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#145509) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 14b67475cf80 to 7cdb240c4a16 (1 revision) (flutter/flutter#145533) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6de3d9b6196a to 14b67475cf80 (1 revision) (flutter/flutter#145529) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from c0d3ac3178fa to 6de3d9b6196a (1 revision) (flutter/flutter#145520) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 23dc0cacc4db to c0d3ac3178fa (1 revision) (flutter/flutter#145519) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from a73e01364de0 to 23dc0cacc4db (2 revisions) (flutter/flutter#145517) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 45ed36c17bb7 to a73e01364de0 (1 revision) (flutter/flutter#145516) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 34b304a27f73 to 45ed36c17bb7 (1 revision) (flutter/flutter#145513) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 912c61f30512 to 34b304a27f73 (1 revision) (flutter/flutter#145511) 2024-03-21 engine-flutter-autoroll@skia.org Roll Flutter Engine from 98cfd9213332 to 912c61f30512 (1 revision) (flutter/flutter#145504) 2024-03-21 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#145476) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from fe6927c79dc3 to 98cfd9213332 (1 revision) (flutter/flutter#145498) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from d1fe8994dedf to fe6927c79dc3 (1 revision) (flutter/flutter#145493) 2024-03-20 bhesaniyavatsal@gmail.com Add helper widget parameter to InputDecoration (flutter/flutter#145157) 2024-03-20 34871572+gmackall@users.noreply.github.com Remove embedding v1 code in framework (flutter/flutter#144726) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from 1b52f57ca07c to d1fe8994dedf (8 revisions) (flutter/flutter#145491) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from f803f2adec54 to 1b52f57ca07c (1 revision) (flutter/flutter#145479) 2024-03-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reland #128236 "Improve build output for all platforms" (#145376)" (flutter/flutter#145487) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from fc2b7a9076b4 to f803f2adec54 (1 revision) (flutter/flutter#145475) 2024-03-20 6655696+guidezpl@users.noreply.github.com Reland #128236 "Improve build output for all platforms" (flutter/flutter#145376) 2024-03-20 engine-flutter-autoroll@skia.org Roll Packages from a2f4ce0 to 23e56af (5 revisions) (flutter/flutter#145470) 2024-03-20 engine-flutter-autoroll@skia.org Roll Flutter Engine from 883adfe2ef61 to fc2b7a9076b4 (1 revision) (flutter/flutter#145469) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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

initial delete

93a5e75

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Mar 6, 2024

gmackall commented Mar 6, 2024

View reviewed changes

gmackall mentioned this pull request Mar 6, 2024

Delete engine v1 android embedding flutter/engine#51229

Merged

8 tasks

Gray Mackall added 4 commits March 6, 2024 14:31

make variable const

da01c50

remove more tests referencing v1 embedding slated for deletion

2783d45

illegalize embedding v1, see where that gets us

cfd4745

remove code that is unused because I deleted other code

abb39b4

gmackall commented Mar 6, 2024

View reviewed changes

Gray Mackall added 5 commits March 6, 2024 15:28

remove unused imports

fe1e1ff

linux tool_tests_commands

eb8a79e

partial delete of failing tool_tests_general

b643ea8

analyze

cec9962

try making some random tests use v2 embedding

e51f165

gmackall commented Mar 12, 2024

View reviewed changes

Gray Mackall added 5 commits March 12, 2024 10:07

maybe only one shardsuiteleft?

c650724

change a bunch of base application names in android_gradle_builder_te…

4e60de7

…st from v1 name to v2 name

try changing android_gradle_builder_test to v2 embeddings

850873d

more removal

4c99995

remove test testing removed code (embedding analytics)

31f3c7c

gmackall marked this pull request as ready for review March 12, 2024 19:15

gmackall requested a review from a team March 12, 2024 19:34

johnmccutchan approved these changes Mar 20, 2024

View reviewed changes

gmackall and others added 5 commits March 20, 2024 12:07

Merge branch 'master' into remove_embeddingv1_stuff

0ff75f5

comment removal

12f3a34

Revert "more removal"

9c8afc0

This reverts commit 4c99995.

remove base application name

dbfc570

Revert "remove test testing removed code (embedding analytics)"

858fa8a

This reverts commit 31f3c7c.

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 20, 2024

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Mar 20, 2024

Revert "remove base application name"

cf163e4

This reverts commit dbfc570.

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 20, 2024

auto-submit bot merged commit 39bdff1 into flutter:master Mar 20, 2024
123 checks passed

engine-flutter-autoroll mentioned this pull request Mar 21, 2024

Roll Flutter from b96c13d1e9ff to 3bfa82919bdc (20 revisions) flutter/packages#6361

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 21, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

34fc304

engine-flutter-autoroll mentioned this pull request Mar 21, 2024

Roll Flutter from b96c13d1e9ff to 33380c6b4293 (21 revisions) flutter/packages#6363

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 21, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

5c746b4

engine-flutter-autoroll mentioned this pull request Mar 21, 2024

Roll Flutter from b96c13d1e9ff to 5545c95df7a8 (22 revisions) flutter/packages#6365

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 21, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

e4c04cc

engine-flutter-autoroll mentioned this pull request Mar 21, 2024

Roll Flutter from b96c13d1e9ff to fd18e5ce48c1 (23 revisions) flutter/packages#6366

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 21, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

5269b5f

engine-flutter-autoroll mentioned this pull request Mar 21, 2024

Roll Flutter from b96c13d1e9ff to 18340ea16cee (26 revisions) flutter/packages#6370

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 21, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

fc3f043

gmackall mentioned this pull request Mar 26, 2024

Delete the 2018-era Android v1 embedder #143531

Open

auto-submit bot mentioned this pull request Apr 9, 2024

Reverts "Delete engine v1 android embedding (#51229)" flutter/engine#51996

Merged

8 tasks

gmackall mentioned this pull request Apr 9, 2024

[many] Remove references to v1 embedding flutter/packages#6494

Merged

11 tasks

gmackall mentioned this pull request May 1, 2024

Remove references to v1 embedding Baseflow/flutter-permission-handler#1316

Closed

This was referenced May 2, 2024

Removes references to Android v1 embedding. Baseflow/flutter-permission-handler#1318

Merged

Removes references to Android v1 embedding. Baseflow/flutter-geocoding#234

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024

39bdff16c Remove embedding v1 code in framework (flutter/flutter#144726)

4ff6f50

alestiago mentioned this pull request May 24, 2024

chore: Remove V1 Embedding from Plugin Template VeryGoodOpenSource/very_good_templates#109

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove embedding v1 code in framework #144726

Remove embedding v1 code in framework #144726

gmackall commented Mar 6, 2024 •

edited

Loading

gmackall Mar 6, 2024

gmackall Mar 6, 2024

gmackall Mar 20, 2024

gmackall Mar 6, 2024

gmackall Mar 12, 2024

gmackall Mar 12, 2024

gmackall Mar 12, 2024

gmackall Mar 12, 2024 •

edited

Loading

gmackall Mar 20, 2024

gmackall commented Mar 20, 2024

auto-submit bot commented Mar 20, 2024

Remove embedding v1 code in framework #144726

Remove embedding v1 code in framework #144726

Conversation

gmackall commented Mar 6, 2024 • edited Loading

Pre-launch Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gmackall Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gmackall commented Mar 20, 2024

auto-submit bot commented Mar 20, 2024

gmackall commented Mar 6, 2024 •

edited

Loading

gmackall Mar 12, 2024 •

edited

Loading