Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Load macOS dart bundle by URL fallback #22979

Merged
jmagman merged 2 commits into from
Dec 10, 2020
Merged

Load macOS dart bundle by URL fallback #22979

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6bb5a
Load dart bundle by URL fallback
jmagman Dec 10, 2020
4cd30df
macOS-only
jmagman Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ + (NSString*)flutterAssetsName:(NSBundle*)bundle {
if (bundle == nil) {
bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
}
if (bundle == nil) {
bundle = [NSBundle bundleWithURL:[NSBundle.mainBundle.privateFrameworksURL
URLByAppendingPathComponent:@"App.framework"]];
}
if (bundle == nil) {
bundle = [NSBundle mainBundle];
}
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ - (instancetype)initWithPrecompiledDartBundle:(NSBundle*)bundle {
NSAssert(self, @"Super init cannot be nil");

_dartBundle = bundle ?: [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
if (_dartBundle == nil) {
Comment thread
jmagman marked this conversation as resolved.
_dartBundle = [NSBundle bundleWithURL:[NSBundle.mainBundle.privateFrameworksURL
URLByAppendingPathComponent:@"App.framework"]];
}
_dartEntrypointArguments = [[NSProcessInfo processInfo] arguments];
// Remove the first element as it's the binary name
_dartEntrypointArguments = [_dartEntrypointArguments
Expand Down