Merge pull request #1012 from mapbox/1011-bundle

Look inside MapboxGL.bundle when present

1 files changed, 10 insertions, 1 deletions

diff --git a/platform/darwin/asset_root.mm b/platform/darwin/asset_root.mm
index 375975a84b..4dc6b58dc2 100644
--- a/platform/darwin/asset_root.mm
+++ b/platform/darwin/asset_root.mm
@@ -2,13 +2,22 @@
 
 #include <mbgl/platform/platform.hpp>
 
+@interface MGLApplicationRootBundleCanary : NSObject
+@end
+
+@implementation MGLApplicationRootBundleCanary
+@end
+
 namespace mbgl {
 namespace platform {
 
 // Returns the path to the root folder of the application.
 const std::string &assetRoot() {
     static const std::string root = []() -> std::string {
-        NSString *path = [[[NSBundle mainBundle] resourceURL] path];
+        NSString *path = [[NSBundle bundleForClass:[MGLApplicationRootBundleCanary class]] pathForResource:@"MapboxGL" ofType:@"bundle"];
+        if (!path) {
+            path = [[[NSBundle mainBundle] resourceURL] path];
+        }
         return {[path cStringUsingEncoding : NSUTF8StringEncoding],
                 [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding]};
     }();