Load dart bundle by URL fallback

flutter · Dec 10, 2020 · 08b38ed · 08b38ed
1 parent 1c5992d
commit 08b38ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -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];
   }

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
@@ -27,6 +27,10 @@ - (instancetype)initWithPrecompiledDartBundle:(NSBundle*)bundle {
   NSAssert(self, @"Super init cannot be nil");
 
   _dartBundle = bundle ?: [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
+  if (_dartBundle == null) {
+    _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