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

Update default flutter_assets path for iOS embedding #7518

Merged
dnfield merged 1 commit into from
Jan 21, 2019
Merged

Update default flutter_assets path for iOS embedding #7518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 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 @@ -182,8 +182,7 @@ - (instancetype)initWithPrecompiledDartBundle:(NSBundle*)bundle {
+ (NSString*)flutterAssetsName:(NSBundle*)bundle {
NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
if (flutterAssetsName == nil) {
// Default to "flutter_assets"
flutterAssetsName = @"flutter_assets";
flutterAssetsName = @"Frameworks/App.framework/flutter_assets";
Copy link
Member

@cbracken cbracken Jan 18, 2019

Choose a reason for hiding this comment

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

Will flutter_tool changes need to land simultaneously with this engine roll, or have we already made the change there and are using some trick like a symlink to support both paths temporarily?

Copy link
Contributor Author

@dnfield dnfield Jan 18, 2019

Choose a reason for hiding this comment

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

See the linked WIP PR. That will be necessary to land this engine roll.

Copy link
Contributor Author

@dnfield dnfield Jan 18, 2019

Choose a reason for hiding this comment

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

flutter/flutter#26713

Copy link
Member

@cbracken cbracken Jan 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Just noticed the linked WIP patch flutter/flutter#26713 and the PR description. I think I answered my own question :-)

Copy link
Contributor Author

@dnfield dnfield Jan 18, 2019

Choose a reason for hiding this comment

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

I'd like to avoid using a symlink if we can - it seems like it increases opportunity for confusion or mistakes

}
return flutterAssetsName;
}
Expand Down