Implemented library uri support for FlutterFragments and FlutterActivities #30726

gaaclarke · 2022-01-07T01:15:27Z

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 Hixie said 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.

…ities.

blasten · 2022-01-08T02:12:18Z

shell/platform/android/io/flutter/embedding/android/FlutterActivity.java

+   *
+   * <p>Example value: "package:foo/bar.dart"
+   *
+   * <p>This preference can be controlled by setting a {@code <meta-data>} called {@link


btw, the manifest can have dynamic values that are passed from the tool to Gradle, then copied into the final manifest. e.g. https://github.com/flutter/flutter/blob/master/packages/flutter_tools/templates/app_shared/android.tmpl/app/src/main/AndroidManifest.xml.tmpl#L5

cc @GaryQian

This needs another migration of existing manifest files

blasten · 2022-01-08T02:14:15Z

shell/platform/android/io/flutter/embedding/android/FlutterActivity.java

@@ -824,6 +825,32 @@ public String getDartEntrypointFunctionName() {
    }
  }

+  /**
+   * The Dart library uri for the entrypoint that will be executed as soon as the Dart snapshot is


nit: uppercase for URI

blasten · 2022-01-08T02:14:37Z

shell/platform/android/io/flutter/embedding/android/FlutterFragment.java

@@ -105,6 +105,8 @@

  /** The Dart entrypoint method name that is executed upon initialization. */
  protected static final String ARG_DART_ENTRYPOINT = "dart_entrypoint";
+  /** */


nit: missing comment

blasten · 2022-01-08T02:14:54Z

shell/platform/android/io/flutter/embedding/android/FlutterFragment.java

@@ -1026,6 +1036,20 @@ public String getDartEntrypointFunctionName() {
    return getArguments().getString(ARG_DART_ENTRYPOINT, "main");
  }

+  /**
+   * Returns the library uri of the Dart method that this {@code FlutterFragment} should execute to


nit: uppercase URI

blasten

lgtm

ColdPaleLight · 2022-01-08T04:32:44Z

I guess that we also need to add getDartEntrypointLibraryUri to FlutterFragmentActivity, just like getDartEntrypointFunctionName.

engine/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java

Lines 685 to 694 in f110bc7

    
           public String getDartEntrypointFunctionName() { 
        
             try { 
        
               Bundle metaData = getMetaData(); 
        
               String desiredDartEntrypoint = 
        
                   metaData != null ? metaData.getString(DART_ENTRYPOINT_META_DATA_KEY) : null; 
        
               return desiredDartEntrypoint != null ? desiredDartEntrypoint : DEFAULT_DART_ENTRYPOINT; 
        
             } catch (PackageManager.NameNotFoundException e) { 
        
               return DEFAULT_DART_ENTRYPOINT; 
        
             } 
        
           }

engine/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java

Lines 472 to 473 in f110bc7

    
           return FlutterFragment.withNewEngine() 
        
               .dartEntrypoint(getDartEntrypointFunctionName())

gaaclarke · 2022-01-10T21:45:17Z

I guess that we also need to add getDartEntrypointLibraryUri to FlutterFragmentActivity, just like getDartEntrypointFunctionName.

It should already exist by virtue of FlutterFragmentActivity inheriting from FlutterActivity. It looks like FlutterFragmentActivity's getDartEntrypointFunctionName is the same as FlutterActivity's. I'm not sure why it overloads it with the exact same code. Probably a quirk of changing inheritance.

…terActivities (flutter/engine#30726)

@nonnull

* 58305d1 Roll Skia from dd575bc0f1f5 to 0056f3f006de (2 revisions) (flutter/engine#30765) * 92a4f99 Allow additional expose_dirs in flutter_runner (flutter/engine#30749) * 358605c [web] Remove EngineParagraph and ParagraphGeometricStyle (flutter/engine#30766) * 8b9f625 Remove glitch when displaying platform views (flutter/engine#30724) * bd65330 Add missing dependencies to the background image app (flutter/engine#30769) * 65dfc9e [android] Remove the FlutterView casting, add a @nonnull and fix code style (flutter/engine#30734) * 00e2a47 Roll Skia from 0056f3f006de to 3e1354a592bc (3 revisions) (flutter/engine#30771) * 279e3af Implemented library uri support for FlutterFragments and FlutterActivities (flutter/engine#30726) * 36ad9f1 Roll Skia from 3e1354a592bc to 55b4dc3f7a1c (1 revision) (flutter/engine#30773)

ColdPaleLight · 2022-01-11T14:14:19Z

It should already exist by virtue of FlutterFragmentActivity inheriting from FlutterActivity. It looks like FlutterFragmentActivity's getDartEntrypointFunctionName is the same as FlutterActivity's. I'm not sure why it overloads it with the exact same code. Probably a quirk of changing inheritance.

Sorry, I didn't express clearly. Since the superclass of FlutterFragmentActivity is FragmentActivity instead of FlutterActivity, I think we still need to add this feature to FlutterFragmentActivity :-)
Here is a PR I filed to do this #30790

…ities (flutter#30726) * Implemented library uri support for FlutterFragments and FlutterActivities. * added docstrings * emmanuel feedback

flutter-dashboard bot added platform-android platform-ios labels Jan 7, 2022

gaaclarke force-pushed the android-library-uri branch 4 times, most recently from 0c3906a to 29b896f Compare January 7, 2022 18:55

Implemented library uri support for FlutterFragments and FlutterActiv…

104dd5c

…ities.

gaaclarke force-pushed the android-library-uri branch from 29b896f to 104dd5c Compare January 7, 2022 19:20

gaaclarke marked this pull request as ready for review January 7, 2022 19:46

gaaclarke requested a review from blasten January 7, 2022 19:46

added docstrings

ce5d993

blasten reviewed Jan 8, 2022

View reviewed changes

blasten approved these changes Jan 8, 2022

View reviewed changes

emmanuel feedback

1cb36e4

gaaclarke merged commit 279e3af into flutter:main Jan 10, 2022

gaaclarke mentioned this pull request Jan 10, 2022

Multiple entry-points in same Dart file is broken flutter/flutter#91841

Closed

engine-flutter-autoroll mentioned this pull request Jan 10, 2022

Roll Engine from 475f6f152d8f to 36ad9f1bbe77 (9 revisions) flutter/flutter#96431

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 10, 2022

279e3af Implemented library uri support for FlutterFragments and Flut…

d5674bc

…terActivities (flutter/engine#30726)

ColdPaleLight mentioned this pull request Jan 11, 2022

Implemented library uri support for FlutterFragmentActivities #30790

Merged

8 tasks

jmagman mentioned this pull request Sep 30, 2024

Update iOS flutterEngine libraryURI flutter/website#11205

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implemented library uri support for FlutterFragments and FlutterActivities #30726

Implemented library uri support for FlutterFragments and FlutterActivities #30726

Uh oh!

gaaclarke commented Jan 7, 2022 •

edited

Loading

Uh oh!

blasten Jan 8, 2022

Uh oh!

blasten Jan 8, 2022

Uh oh!

blasten Jan 8, 2022

Uh oh!

gaaclarke Jan 10, 2022

Uh oh!

blasten Jan 8, 2022

Uh oh!

gaaclarke Jan 10, 2022

Uh oh!

blasten Jan 8, 2022

Uh oh!

gaaclarke Jan 10, 2022

Uh oh!

blasten left a comment

Uh oh!

ColdPaleLight commented Jan 8, 2022 •

edited

Loading

Uh oh!

gaaclarke commented Jan 10, 2022

Uh oh!

ColdPaleLight commented Jan 11, 2022 •

edited

Loading

Uh oh!

Uh oh!

Implemented library uri support for FlutterFragments and FlutterActivities #30726

Implemented library uri support for FlutterFragments and FlutterActivities #30726

Uh oh!

Conversation

gaaclarke commented Jan 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blasten left a comment

Choose a reason for hiding this comment

Uh oh!

ColdPaleLight commented Jan 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gaaclarke commented Jan 10, 2022

Uh oh!

ColdPaleLight commented Jan 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

gaaclarke commented Jan 7, 2022 •

edited

Loading

ColdPaleLight commented Jan 8, 2022 •

edited

Loading

ColdPaleLight commented Jan 11, 2022 •

edited

Loading