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

Load iOS dart bundle by URL fallback #22997

Merged
merged 1 commit into from
Dec 10, 2020

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented Dec 10, 2020

Description

flutter/flutter#51453 stopped explicitly linking the App.framework into the iOS app, which means [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]] returns null because the bundle isn't loaded (no longer LC_LOAD_DYLIB)

This is awkwardly worked around by loading the asset path Frameworks/App.framework/flutter_assets from the main bundle #7518.

NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
if (flutterAssetsName == nil) {
flutterAssetsName = @"Frameworks/App.framework/flutter_assets";
}

Instead, fallback to detecting the dart bundle by path to Frameworks/App.framework.

Related Issues

iOS version of #22979.

Tests

I'm not sure how to explicitly test this, but any devicelab run tests will blow up if the assets aren't found.

@jmagman jmagman self-assigned this Dec 10, 2020
@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 Hixie on the #hackers channel in Chat.

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

Copy link
Contributor

@dnfield dnfield left a comment

Choose a reason for hiding this comment

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

LGTM

@chinmaygarde chinmaygarde added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Dec 10, 2020
@fluttergithubbot fluttergithubbot merged commit 9df2157 into flutter:master Dec 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2020
dnfield pushed a commit to flutter/flutter that referenced this pull request Dec 11, 2020
* 3a30ae3 Fix ios voiceover (for safari >13.4) (flutter/engine#22965)

* 4338849 Replace g_object_weak_ref with g_object_add_weak_pointer

* 3b9937a Load macOS dart bundle by URL fallback (flutter/engine#22979)

* 96927bb add ffi_struct_patch.dart to libraries.yaml (flutter/engine#23000)

* 2efc7c1 Set SkPath::setIsVolatile based on whether the path survives at least two frames (flutter/engine#22620)

* bb81b95 Allow Tile mode for blur filter and add new decal TileMode (flutter/engine#22982)

* 9df2157 Load iOS dart bundle by URL fallback (flutter/engine#22997)

* 7647fdb Roll Skia from 22f80a60b17f to 6b07e0eb497c (26 revisions) (flutter/engine#23005)

* 062cbd8 Freiling warmup memory (flutter/engine#22984)

* 1646966 Revert "Freiling warmup memory (#22984)" (flutter/engine#23007)

* 50d830a [web] Do not reset 'cursor' in PersistedPlatformView. (flutter/engine#22977)

* 6ebf5c3 Roll Dart SDK from e4c9b06267d3 to a4e6fe145bf7 (2 revisions) (flutter/engine#23006)

* 14c8c24 [web] Fix regression in foreground style (flutter/engine#22999)

* 6678efa Implement SystemSound.play

* fb769a4 Roll Fuchsia Linux SDK from rnN_X2o75... to ESzmO-yOF... (flutter/engine#23010)

* b424356 Roll Skia from 6b07e0eb497c to f7cce2b243b2 (6 revisions) (flutter/engine#23018)

* 56035c7 Roll Fuchsia Linux SDK from ESzmO-yOF... to K4cPd0-Xd... (flutter/engine#23020)

* cb4a2ef Roll Skia from f7cce2b243b2 to b0cb8372c1ef (3 revisions) (flutter/engine#23021)

* cc8c9d4 Roll Skia from b0cb8372c1ef to 5284e96599a8 (2 revisions) (flutter/engine#23023)

* 8e9a943 Roll Dart SDK from a4e6fe145bf7 to c287db6bf232 (2 revisions) (flutter/engine#23024)

* 714b543 Roll Fuchsia Mac SDK from OUQEzH1oE... to a9yuHfriB... (flutter/engine#23025)

* d50cdda Roll Dart SDK from c287db6bf232 to 2553a84fe438 (1 revision) (flutter/engine#23026)

* 4794d04 Roll Skia from 5284e96599a8 to f7fdf1aa2911 (1 revision) (flutter/engine#23027)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 14, 2020
@jmagman jmagman deleted the app-load-ios branch December 14, 2020 20:01
@jmagman jmagman restored the app-load-ios branch December 14, 2020 20:01
@jmagman jmagman deleted the app-load-ios branch December 14, 2020 20:01
jmagman added a commit that referenced this pull request Dec 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 14, 2020
jmagman added a commit that referenced this pull request Dec 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 15, 2020
gspencergoog pushed a commit to gspencergoog/engine that referenced this pull request Jan 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes platform-ios waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants