diff --git a/.circleci/config.yml b/.circleci/config.yml
index 731706010..068e1dba1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -377,6 +377,6 @@ jobs:
       - run:
           name: Build Android library
           command: |
-            cd vendor/mapbox-gl-native/misc/buck
+            cd misc/buck
             buck build mapbox-gl-native:android-core
   # ------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/core-files.json b/core-files.json
new file mode 100644
index 000000000..70b748234
--- /dev/null
+++ b/core-files.json
@@ -0,0 +1,195 @@
+{
+    "//": "This file can be edited manually and is the canonical source.",
+    "sources": [
+        "vendor-android/mapbox-gl-native/platform/android/src/main.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/android_renderer_backend.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/android_renderer_frontend.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/annotation/marker.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/annotation/polygon.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/annotation/polyline.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/async_task.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/attach_env.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/bitmap.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/bitmap_factory.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/conversion/collection.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/conversion/color.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/conversion/constant.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/feature.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/feature_collection.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/geometry.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/geometry_collection.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/line_string.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_line_string.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_point.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_polygon.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/point.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geojson/polygon.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng_bounds.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng_quad.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/geometry/projected_meters.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/graphics/pointf.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/graphics/rectf.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/gson/json_array.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/gson/json_element.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/gson/json_object.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/gson/json_primitive.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/i18n/collator.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/i18n/number_format.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/image.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/java/util.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/java_types.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/jni.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/jni_native.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/logger.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/logging_android.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/mapbox.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/map/camera_position.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/map/image.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/map_renderer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/map_renderer_runnable.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/native_map_view.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/run_loop.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/snapshotter/map_snapshot.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/snapshotter/map_snapshotter.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/string_util.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/filter.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/position.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/transition_options.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/url_or_tileset.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/formatted.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/formatted_section.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/background_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/circle_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/custom_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/fill_extrusion_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/fill_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/heatmap_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/hillshade_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/layer_manager.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/line_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/raster_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/layers/symbol_layer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/light.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/position.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/custom_geometry_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/geojson_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/image_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/raster_dem_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/raster_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/unknown_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/sources/vector_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/transition_options.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/style/value.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/text/local_glyph_rasterizer.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/gl_functions.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/thread.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/timer.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/gfx/headless_backend.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/gfx/headless_frontend.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/gl/headless_backend.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/map/map_snapshotter.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/text/bidi.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/util/compression.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/util/monotonic_timer.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/util/png_writer.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/util/thread_local.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/util/utf.cpp",
+        "vendor-android/mapbox-gl-native/platform/linux/src/headless_backend_egl.cpp"
+    ],
+    "public_headers": {
+        "jni/string_conversion.hpp": "vendor-android/mapbox-gl-native/platform/default/include/jni/string_conversion.hpp",
+        "mbgl/gfx/headless_backend.hpp": "vendor-android/mapbox-gl-native/platform/default/include/mbgl/gfx/headless_backend.hpp",
+        "mbgl/gfx/headless_frontend.hpp": "vendor-android/mapbox-gl-native/platform/default/include/mbgl/gfx/headless_frontend.hpp",
+        "mbgl/gl/headless_backend.hpp": "vendor-android/mapbox-gl-native/platform/default/include/mbgl/gl/headless_backend.hpp",
+        "mbgl/map/map_snapshotter.hpp": "vendor-android/mapbox-gl-native/platform/default/include/mbgl/map/map_snapshotter.hpp"
+    },
+    "private_headers": {
+        "android_renderer_backend.hpp": "vendor-android/mapbox-gl-native/platform/android/src/android_renderer_backend.hpp",
+        "android_renderer_frontend.hpp": "vendor-android/mapbox-gl-native/platform/android/src/android_renderer_frontend.hpp",
+        "annotation/marker.hpp": "vendor-android/mapbox-gl-native/platform/android/src/annotation/marker.hpp",
+        "annotation/multi_point.hpp": "vendor-android/mapbox-gl-native/platform/android/src/annotation/multi_point.hpp",
+        "annotation/polygon.hpp": "vendor-android/mapbox-gl-native/platform/android/src/annotation/polygon.hpp",
+        "annotation/polyline.hpp": "vendor-android/mapbox-gl-native/platform/android/src/annotation/polyline.hpp",
+        "attach_env.hpp": "vendor-android/mapbox-gl-native/platform/android/src/attach_env.hpp",
+        "bitmap.hpp": "vendor-android/mapbox-gl-native/platform/android/src/bitmap.hpp",
+        "bitmap_factory.hpp": "vendor-android/mapbox-gl-native/platform/android/src/bitmap_factory.hpp",
+        "conversion/collection.hpp": "vendor-android/mapbox-gl-native/platform/android/src/conversion/collection.hpp",
+        "conversion/color.hpp": "vendor-android/mapbox-gl-native/platform/android/src/conversion/color.hpp",
+        "conversion/constant.hpp": "vendor-android/mapbox-gl-native/platform/android/src/conversion/constant.hpp",
+        "conversion/conversion.hpp": "vendor-android/mapbox-gl-native/platform/android/src/conversion/conversion.hpp",
+        "geojson/feature.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/feature.hpp",
+        "geojson/feature_collection.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/feature_collection.hpp",
+        "geojson/geometry.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/geometry.hpp",
+        "geojson/geometry_collection.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/geometry_collection.hpp",
+        "geojson/line_string.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/line_string.hpp",
+        "geojson/multi_line_string.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_line_string.hpp",
+        "geojson/multi_point.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_point.hpp",
+        "geojson/multi_polygon.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/multi_polygon.hpp",
+        "geojson/point.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/point.hpp",
+        "geojson/polygon.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/polygon.hpp",
+        "geojson/util.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geojson/util.hpp",
+        "geometry/lat_lng.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng.hpp",
+        "geometry/lat_lng_bounds.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng_bounds.hpp",
+        "geometry/lat_lng_quad.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geometry/lat_lng_quad.hpp",
+        "geometry/projected_meters.hpp": "vendor-android/mapbox-gl-native/platform/android/src/geometry/projected_meters.hpp",
+        "graphics/pointf.hpp": "vendor-android/mapbox-gl-native/platform/android/src/graphics/pointf.hpp",
+        "graphics/rectf.hpp": "vendor-android/mapbox-gl-native/platform/android/src/graphics/rectf.hpp",
+        "gson/json_array.hpp": "vendor-android/mapbox-gl-native/platform/android/src/gson/json_array.hpp",
+        "gson/json_element.hpp": "vendor-android/mapbox-gl-native/platform/android/src/gson/json_element.hpp",
+        "gson/json_object.hpp": "vendor-android/mapbox-gl-native/platform/android/src/gson/json_object.hpp",
+        "gson/json_primitive.hpp": "vendor-android/mapbox-gl-native/platform/android/src/gson/json_primitive.hpp",
+        "java/util.hpp": "vendor-android/mapbox-gl-native/platform/android/src/java/util.hpp",
+        "java_types.hpp": "vendor-android/mapbox-gl-native/platform/android/src/java_types.hpp",
+        "jni.hpp": "vendor-android/mapbox-gl-native/platform/android/src/jni.hpp",
+        "jni_native.hpp": "vendor-android/mapbox-gl-native/platform/android/src/jni_native.hpp",
+        "i18n/collator_jni.hpp": "vendor-android/mapbox-gl-native/platform/android/src/i18n/collator_jni.hpp",
+        "i18n/number_format_jni.hpp": "vendor-android/mapbox-gl-native/platform/android/src/i18n/number_format_jni.hpp",
+        "logger.hpp": "vendor-android/mapbox-gl-native/platform/android/src/logger.hpp",
+        "mapbox.hpp": "vendor-android/mapbox-gl-native/platform/android/src/mapbox.hpp",
+        "map/camera_position.hpp": "vendor-android/mapbox-gl-native/platform/android/src/map/camera_position.hpp",
+        "map/image.hpp": "vendor-android/mapbox-gl-native/platform/android/src/map/image.hpp",
+        "map_renderer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/map_renderer.hpp",
+        "map_renderer_runnable.hpp": "vendor-android/mapbox-gl-native/platform/android/src/map_renderer_runnable.hpp",
+        "native_map_view.hpp": "vendor-android/mapbox-gl-native/platform/android/src/native_map_view.hpp",
+        "run_loop_impl.hpp": "vendor-android/mapbox-gl-native/platform/android/src/run_loop_impl.hpp",
+        "snapshotter/map_snapshot.hpp": "vendor-android/mapbox-gl-native/platform/android/src/snapshotter/map_snapshot.hpp",
+        "snapshotter/map_snapshotter.hpp": "vendor-android/mapbox-gl-native/platform/android/src/snapshotter/map_snapshotter.hpp",
+        "style/android_conversion.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/android_conversion.hpp",
+        "style/conversion/filter.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/filter.hpp",
+        "style/conversion/position.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/position.hpp",
+        "style/conversion/property_expression.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/property_expression.hpp",
+        "style/conversion/property_value.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/property_value.hpp",
+        "style/conversion/transition_options.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/transition_options.hpp",
+        "style/conversion/url_or_tileset.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/conversion/url_or_tileset.hpp",
+        "style/formatted.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/formatted.hpp",
+        "style/formatted_section.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/formatted_section.hpp",
+        "style/layers/background_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/background_layer.hpp",
+        "style/layers/circle_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/circle_layer.hpp",
+        "style/layers/custom_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/custom_layer.hpp",
+        "style/layers/fill_extrusion_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/fill_extrusion_layer.hpp",
+        "style/layers/fill_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/fill_layer.hpp",
+        "style/layers/heatmap_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/heatmap_layer.hpp",
+        "style/layers/hillshade_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/hillshade_layer.hpp",
+        "style/layers/layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/layer.hpp",
+        "style/layers/layer_manager.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/layer_manager.hpp",
+        "style/layers/line_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/line_layer.hpp",
+        "style/layers/raster_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/raster_layer.hpp",
+        "style/layers/symbol_layer.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/layers/symbol_layer.hpp",
+        "style/light.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/light.hpp",
+        "style/position.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/position.hpp",
+        "style/sources/custom_geometry_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/custom_geometry_source.hpp",
+        "style/sources/geojson_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/geojson_source.hpp",
+        "style/sources/image_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/image_source.hpp",
+        "style/sources/raster_dem_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/raster_dem_source.hpp",
+        "style/sources/raster_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/raster_source.hpp",
+        "style/sources/source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/source.hpp",
+        "style/sources/unknown_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/unknown_source.hpp",
+        "style/sources/vector_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/sources/vector_source.hpp",
+        "style/transition_options.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/transition_options.hpp",
+        "style/value.hpp": "vendor-android/mapbox-gl-native/platform/android/src/style/value.hpp",
+        "text/local_glyph_rasterizer_jni.hpp": "vendor-android/mapbox-gl-native/platform/android/src/text/local_glyph_rasterizer_jni.hpp"
+    }
+}
\ No newline at end of file
diff --git a/filesource-files.json b/filesource-files.json
new file mode 100644
index 000000000..7be8bc8a0
--- /dev/null
+++ b/filesource-files.json
@@ -0,0 +1,27 @@
+{
+    "//": "This file can be edited manually and is the canonical source.",
+    "sources": [
+        "vendor-android/mapbox-gl-native/platform/android/src/asset_manager_file_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/connectivity_listener.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/file_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/http_file_source.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_manager.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_definition.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_error.cpp",
+        "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_status.cpp",
+        "vendor-android/mapbox-gl-native/platform/default/src/mbgl/storage/sqlite3.cpp"
+    ],
+    "public_headers": {},
+    "private_headers": {
+        "asset_manager.hpp": "vendor-android/mapbox-gl-native/platform/android/src/asset_manager.hpp",
+        "asset_manager_file_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/asset_manager_file_source.hpp",
+        "connectivity_listener.hpp": "vendor-android/mapbox-gl-native/platform/android/src/connectivity_listener.hpp",
+        "file_source.hpp": "vendor-android/mapbox-gl-native/platform/android/src/file_source.hpp",
+        "offline/offline_manager.hpp": "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_manager.hpp",
+        "offline/offline_region.hpp": "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region.hpp",
+        "offline/offline_region_definition.hpp": "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_definition.hpp",
+        "offline/offline_region_error.hpp": "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_error.hpp",
+        "offline/offline_region_status.hpp": "vendor-android/mapbox-gl-native/platform/android/src/offline/offline_region_status.hpp"
+    }
+}
\ No newline at end of file
diff --git a/misc/buck/.buckconfig b/misc/buck/.buckconfig
new file mode 100644
index 000000000..f8d656612
--- /dev/null
+++ b/misc/buck/.buckconfig
@@ -0,0 +1,15 @@
+[ndk]
+cpu_abis = armv7
+compiler = clang
+app_platform = android-14
+
+[project]
+ignore = .git
+allow_symlinks = allow
+
+[cxx]
+default_platform = iphonesimulator-x86_64
+
+[apple]
+iphonesimulator_target_sdk_version = 9.0
+iphoneos_target_sdk_version = 9.0
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/Android.mk b/misc/buck/mapbox-gl-native/Android.mk
new file mode 100644
index 000000000..ba1e2dd70
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/Android.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-core
+include $(BUILD_SHARED_LIBRARY)
diff --git a/misc/buck/mapbox-gl-native/Application.mk b/misc/buck/mapbox-gl-native/Application.mk
new file mode 100644
index 000000000..a11b28deb
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := armeabi-v7a
+APP_PLATFORM := android-14
diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK
new file mode 100644
index 000000000..30695821e
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/BUCK
@@ -0,0 +1,140 @@
+# BUILD FILE SYNTAX: SKYLARK
+
+import json
+
+mbgl_base_path = get_base_path() or '.'
+android_base_path = '../../'
+
+def mbgl_load_file_lists(*argv):
+    merged = dict(sources = [], public_headers = {}, private_headers = {})
+    for arg in argv:
+        filename = mbgl_base_path + '/' + arg + '-files.json'
+        add_build_file_dep('//' + filename)
+        files = json.load(open(filename))
+        merged['public_headers'].update(files['public_headers'])
+        merged['private_headers'].update(files['private_headers'])
+        merged['sources'] += files['sources']
+    return merged
+
+def android_load_file_lists(*argv):
+    merged = dict(sources = [], public_headers = {}, private_headers = {})
+    for arg in argv:
+        filename = '../../' + arg + '-files.json'
+        add_build_file_dep('//' + filename)
+        files = json.load(open(filename))
+        merged['public_headers'].update(files['public_headers'])
+        merged['private_headers'].update(files['private_headers'])
+        merged['sources'] += files['sources']
+    return merged
+
+mbgl = dict(
+    core = mbgl_load_file_lists('src/core', 'platform/default/filesource'),
+    android = android_load_file_lists('core', 'filesource'),
+    deps = [],
+)
+
+def mbgl_vendor_library(name):
+    files = mbgl_load_file_lists('vendor/' + name)
+    cxx_library(
+        name = "vendor-" + name,
+        header_namespace = "",
+        srcs = files['sources'],
+        headers = files['private_headers'],
+        exported_headers = files['public_headers'],
+        link_style = 'static',
+        compiler_flags = [
+            "-Wno-tautological-unsigned-enum-zero-compare",
+        ],
+    )
+    mbgl['deps'].append(':vendor-' + name)
+
+mbgl_vendor_library("icu")
+mbgl_vendor_library("boost")
+mbgl_vendor_library("cheap-ruler-cpp")
+mbgl_vendor_library("earcut.hpp")
+mbgl_vendor_library("eternal")
+mbgl_vendor_library("geojson-vt-cpp")
+mbgl_vendor_library("mapbox-base")
+mbgl_vendor_library("sqlite")
+mbgl_vendor_library("polylabel")
+mbgl_vendor_library("protozero")
+mbgl_vendor_library("shelf-pack-cpp")
+mbgl_vendor_library("unique_resource")
+mbgl_vendor_library("vector-tile")
+mbgl_vendor_library("wagyu")
+
+cxx_library(
+    name = "core",
+
+    srcs = mbgl['core']['sources'],
+    platform_srcs = [
+        ("android", mbgl['android']['sources']),
+    ],
+
+    header_namespace = "",
+    headers = mbgl['core']['private_headers'],
+    exported_headers = mbgl['core']['public_headers'],
+    platform_headers = [
+        ("android", mbgl['android']['private_headers'])
+    ],
+    exported_platform_headers = [
+        ("android", mbgl['android']['public_headers']),
+    ],
+
+    compiler_flags = [
+        "-std=c++14",
+        "-g",
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wno-unused-variable",
+        "-Wno-unused-parameter",
+        "-Wno-c++11-narrowing",
+        "-Wno-tautological-constant-compare",
+        "-fexceptions",
+        "-ftemplate-depth=1024",
+        "-frtti",
+    ],
+
+    preprocessor_flags = [
+        "-DMBGL_USE_GLES2=1",
+        "-DMBGL_VERSION_REV=\"standalone\"",
+        "-DRAPIDJSON_HAS_STDSTRING=1",
+    ],
+    exported_platform_linker_flags = [
+        ("android", [
+            "-lz",
+            "-lEGL",
+            "-lGLESv2",
+            "-landroid",
+            "-ljnigraphics",
+            "-llog",
+            "-fvisibility=hidden",
+            "-Wl,--icf=safe",
+            "-Wl,--version-script=" + android_base_path + "version-script"
+        ]),
+    ],
+
+    visibility = ["PUBLIC"],
+    deps = mbgl['deps'],
+    soname = "libmapbox-gl.$(ext)",
+)
+
+ndk_library(
+    name = "android-core",
+    deps = [ ":core" ],
+    flags = [
+        "NDK_APPLICATION_MK=$(env PWD)/" + mbgl_base_path + "/Application.mk",
+    ],
+)
+
+android_manifest(
+  name = 'android-manifest',
+  skeleton = 'sdk/src/main/AndroidManifest.xml',
+)
+
+android_library(
+    name = "android",
+    deps = [ ":android-core" ],
+    manifest = ":android-manifest",
+)
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/include b/misc/buck/mapbox-gl-native/include
new file mode 120000
index 000000000..aabe3d4b8
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/include
@@ -0,0 +1 @@
+../../../vendor/mapbox-gl-native/include
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/mapbox-gl-native b/misc/buck/mapbox-gl-native/mapbox-gl-native
new file mode 120000
index 000000000..e0ea80599
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/mapbox-gl-native
@@ -0,0 +1 @@
+../../../vendor/mapbox-gl-native
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/platform b/misc/buck/mapbox-gl-native/platform
new file mode 120000
index 000000000..d05709529
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/platform
@@ -0,0 +1 @@
+../../../vendor/mapbox-gl-native/platform
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/sdk b/misc/buck/mapbox-gl-native/sdk
new file mode 120000
index 000000000..468e979db
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/sdk
@@ -0,0 +1 @@
+../../../MapboxGLAndroidSDK
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/src b/misc/buck/mapbox-gl-native/src
new file mode 120000
index 000000000..86b9c406a
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/src
@@ -0,0 +1 @@
+../../../vendor/mapbox-gl-native/src
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/vendor b/misc/buck/mapbox-gl-native/vendor
new file mode 120000
index 000000000..8272665fb
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/vendor
@@ -0,0 +1 @@
+../../../vendor/mapbox-gl-native/vendor
\ No newline at end of file
diff --git a/misc/buck/mapbox-gl-native/vendor-android b/misc/buck/mapbox-gl-native/vendor-android
new file mode 120000
index 000000000..c73e2c9ac
--- /dev/null
+++ b/misc/buck/mapbox-gl-native/vendor-android
@@ -0,0 +1 @@
+../../../vendor
\ No newline at end of file
diff --git a/version-script b/version-script
new file mode 100644
index 000000000..7c1e3d54a
--- /dev/null
+++ b/version-script
@@ -0,0 +1,4 @@
+{
+  global: JNI_OnLoad;
+  local: *;
+};
\ No newline at end of file