provide resource bundle search for premade frameworks

1 files changed, 14 insertions, 1 deletions

diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/NSBundle+MGLAdditions.m
index 3fca7384a3..d5842ea596 100644
--- a/platform/ios/NSBundle+MGLAdditions.m
+++ b/platform/ios/NSBundle+MGLAdditions.m
@@ -8,8 +8,21 @@ void mgl_linkBundleCategory(){}
 
 + (NSString *)mgl_resourceBundlePath
 {
-    NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"Mapbox" ofType:@"bundle"];
+    NSString *resourceBundlePath = nil;
 
+    // check for resource bundle in framework bundle (Fabric, premade framework)
+    //
+    NSString *frameworkBundlePath = [NSString stringWithFormat:@"%@/Mapbox.framework/Mapbox.bundle",
+        [[NSBundle mainBundle] privateFrameworksPath]];
+    if ([NSBundle bundleWithPath:frameworkBundlePath]) resourceBundlePath = frameworkBundlePath;
+
+    // check for resource bundle in app bundle (static library)
+    //
+    if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle bundleForClass:
+        [MGLMapView class]] pathForResource:@"Mapbox" ofType:@"bundle"];
+
+    // fall back to resources directly in app bundle (test app)
+    //
     if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle mainBundle] bundlePath];
 
     return resourceBundlePath;