fix

Author: Chris Yang

shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm

@@ -8,8 +8,8 @@
 
 FLUTTER_ASSERT_ARC
 
-const NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
-static NSString* GetFlutterAssetPathFromBundle(NSBundle* bundle);
+NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath);
 
 NSBundle* FLTFrameworkBundleInternal(NSString* flutterFrameworkBundleID, NSURL* searchURL) {
   NSDirectoryEnumerator<NSURL*>* frameworkEnumerator = [NSFileManager.defaultManager
@@ -59,18 +59,18 @@
 }
 
 NSString* FLTAssetsPathFromBundle(NSBundle* bundle) {
-  NSString* flutterAssetsPath = GetFlutterAssetPathFromBundle(bundle);
+  NSString* relativeAssetsPath = FLTAssetPath(bundle);
+  NSString* flutterAssetsPath = GetFlutterAssetsPathFromBundle(bundle, relativeAssetsPath);
   if (flutterAssetsPath.length == 0) {
-    flutterAssetsPath = GetFlutterAssetPathFromBundle(NSBundle.mainBundle);
+    flutterAssetsPath = GetFlutterAssetsPathFromBundle(NSBundle.mainBundle, relativeAssetsPath);
   }
   return flutterAssetsPath;
 }
 
-static NSString* GetFlutterAssetPathFromBundle(NSBundle* bundle) {
-  NSString* flutterAssetsPath = FLTAssetPath(bundle);
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath) {
   // Use the raw path solution so that asset path can be returned from unloaded bundles.
   // See https://github.com/flutter/engine/pull/46073
-  NSString* assetsPath = [bundle pathForResource:flutterAssetsPath ofType:nil];
+  NSString* assetsPath = [bundle pathForResource:relativeAssetsPath ofType:nil];
   if (assetsPath.length == 0) {
     // In app extension, using full relative path (kDefaultAssetPath)
     // returns nil when the app bundle is not loaded. Try to use

shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm

@@ -97,6 +97,18 @@ - (void)testFLTAssetsURLFromBundle {
     NSString* path = FLTAssetsPathFromBundle(mockBundle);
     XCTAssertEqualObjects(path, @"path/to/foo/assets");
   }
+  {
+    // Found asset path in info.plist, is not overriden by main bundle
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* resultAssetsPath = @"path/to/foo/assets";
+    OCMStub([mockBundle pathForResource:@"foo/assets" ofType:nil]).andReturn(resultAssetsPath);
+    NSString* path = FLTAssetsPathFromBundle(mockBundle);
+    XCTAssertEqualObjects(path, @"path/to/foo/assets");
+    [mockMainBundle stopMocking];
+  }
   {
     // No asset path in info.plist, defaults to main bundle
     id mockBundle = OCMClassMock([NSBundle class]);
@@ -108,6 +120,7 @@ - (void)testFLTAssetsURLFromBundle {
         .andReturn(resultAssetsPath);
     NSString* path = FLTAssetsPathFromBundle(mockBundle);
     XCTAssertEqualObjects(path, @"path/to/foo/assets");
+    [mockMainBundle stopMocking];
   }
 }