diff options
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/config.cmake | 12 | ||||
| -rw-r--r-- | platform/android/core-files.json | 190 | ||||
| -rw-r--r-- | platform/android/core-files.txt | 223 | ||||
| -rw-r--r-- | platform/android/filesource-files.json | 27 | ||||
| -rw-r--r-- | platform/android/filesource-files.txt | 28 | ||||
| -rw-r--r-- | platform/android/include/mbgl/gl/gl_impl.hpp (renamed from platform/android/mbgl/gl/gl_impl.hpp) | 0 |
6 files changed, 223 insertions, 257 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index b553b5b8ab..4a2361a7db 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -34,12 +34,12 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWIT ## mbgl core ## macro(mbgl_platform_core) - # Modify platform/android/core-files.txt to change the source files for this target. - target_sources_from_file(mbgl-core PRIVATE platform/android/core-files.txt) + # Modify platform/android/core-files.json to change the source files for this target. + target_sources_from_file(mbgl-core PRIVATE platform/android/core-files.json) target_include_directories(mbgl-core PUBLIC platform/default/include - PRIVATE platform/android + PRIVATE platform/android/include ) target_link_libraries(mbgl-core @@ -57,8 +57,8 @@ endmacro() macro(mbgl_filesource) - # Modify platform/android/filesource-files.txt to change the source files for this target. - target_sources_from_file(mbgl-filesource PRIVATE platform/android/filesource-files.txt) + # Modify platform/android/filesource-files.json to change the source files for this target. + target_sources_from_file(mbgl-filesource PRIVATE platform/android/filesource-files.json) target_link_libraries(mbgl-filesource PUBLIC sqlite @@ -97,7 +97,7 @@ macro(mbgl_platform_test) ) target_include_directories(mbgl-test - PRIVATE platform/android + PRIVATE platform/android/include ) target_link_libraries(mbgl-test diff --git a/platform/android/core-files.json b/platform/android/core-files.json new file mode 100644 index 0000000000..6e3efd019f --- /dev/null +++ b/platform/android/core-files.json @@ -0,0 +1,190 @@ +{ + "//": "This file can be edited manually and is the canonical source.", + "sources": [ + "platform/android/src/main.cpp", + "platform/android/src/android_renderer_backend.cpp", + "platform/android/src/android_renderer_frontend.cpp", + "platform/android/src/annotation/marker.cpp", + "platform/android/src/annotation/polygon.cpp", + "platform/android/src/annotation/polyline.cpp", + "platform/android/src/async_task.cpp", + "platform/android/src/attach_env.cpp", + "platform/android/src/bitmap.cpp", + "platform/android/src/bitmap_factory.cpp", + "platform/android/src/conversion/collection.cpp", + "platform/android/src/conversion/color.cpp", + "platform/android/src/conversion/constant.cpp", + "platform/android/src/geojson/feature.cpp", + "platform/android/src/geojson/feature_collection.cpp", + "platform/android/src/geojson/geometry.cpp", + "platform/android/src/geojson/geometry_collection.cpp", + "platform/android/src/geojson/line_string.cpp", + "platform/android/src/geojson/multi_line_string.cpp", + "platform/android/src/geojson/multi_point.cpp", + "platform/android/src/geojson/multi_polygon.cpp", + "platform/android/src/geojson/point.cpp", + "platform/android/src/geojson/polygon.cpp", + "platform/android/src/geometry/lat_lng.cpp", + "platform/android/src/geometry/lat_lng_bounds.cpp", + "platform/android/src/geometry/lat_lng_quad.cpp", + "platform/android/src/geometry/projected_meters.cpp", + "platform/android/src/graphics/pointf.cpp", + "platform/android/src/graphics/rectf.cpp", + "platform/android/src/gson/json_array.cpp", + "platform/android/src/gson/json_element.cpp", + "platform/android/src/gson/json_object.cpp", + "platform/android/src/gson/json_primitive.cpp", + "platform/android/src/image.cpp", + "platform/android/src/java/util.cpp", + "platform/android/src/java_types.cpp", + "platform/android/src/jni.cpp", + "platform/android/src/logger.cpp", + "platform/android/src/logging_android.cpp", + "platform/android/src/map/camera_position.cpp", + "platform/android/src/map/image.cpp", + "platform/android/src/map_renderer.cpp", + "platform/android/src/map_renderer_runnable.cpp", + "platform/android/src/native_map_view.cpp", + "platform/android/src/run_loop.cpp", + "platform/android/src/snapshotter/map_snapshot.cpp", + "platform/android/src/snapshotter/map_snapshotter.cpp", + "platform/android/src/string_util.cpp", + "platform/android/src/style/conversion/filter.cpp", + "platform/android/src/style/conversion/position.cpp", + "platform/android/src/style/conversion/transition_options.cpp", + "platform/android/src/style/conversion/url_or_tileset.cpp", + "platform/android/src/style/formatted.cpp", + "platform/android/src/style/formatted_section.cpp", + "platform/android/src/style/layers/background_layer.cpp", + "platform/android/src/style/layers/circle_layer.cpp", + "platform/android/src/style/layers/custom_layer.cpp", + "platform/android/src/style/layers/fill_extrusion_layer.cpp", + "platform/android/src/style/layers/fill_layer.cpp", + "platform/android/src/style/layers/heatmap_layer.cpp", + "platform/android/src/style/layers/hillshade_layer.cpp", + "platform/android/src/style/layers/layer.cpp", + "platform/android/src/style/layers/layer_manager.cpp", + "platform/android/src/style/layers/line_layer.cpp", + "platform/android/src/style/layers/raster_layer.cpp", + "platform/android/src/style/layers/symbol_layer.cpp", + "platform/android/src/style/light.cpp", + "platform/android/src/style/position.cpp", + "platform/android/src/style/sources/custom_geometry_source.cpp", + "platform/android/src/style/sources/geojson_source.cpp", + "platform/android/src/style/sources/image_source.cpp", + "platform/android/src/style/sources/raster_dem_source.cpp", + "platform/android/src/style/sources/raster_source.cpp", + "platform/android/src/style/sources/source.cpp", + "platform/android/src/style/sources/unknown_source.cpp", + "platform/android/src/style/sources/vector_source.cpp", + "platform/android/src/style/transition_options.cpp", + "platform/android/src/style/value.cpp", + "platform/android/src/text/collator.cpp", + "platform/android/src/text/local_glyph_rasterizer.cpp", + "platform/android/src/thread.cpp", + "platform/android/src/timer.cpp", + "platform/android/src/unaccent.cpp", + "platform/default/src/mbgl/gl/headless_backend.cpp", + "platform/default/src/mbgl/gl/headless_frontend.cpp", + "platform/default/src/mbgl/map/map_snapshotter.cpp", + "platform/default/src/mbgl/text/bidi.cpp", + "platform/default/src/mbgl/util/default_thread_pool.cpp", + "platform/default/src/mbgl/util/png_writer.cpp", + "platform/default/src/mbgl/util/shared_thread_pool.cpp", + "platform/default/src/mbgl/util/thread_local.cpp", + "platform/default/src/mbgl/util/utf.cpp", + "platform/linux/src/headless_backend_egl.cpp" + ], + "public_headers": { + "mbgl/gl/gl_impl.hpp": "platform/android/include/mbgl/gl/gl_impl.hpp", + "jni/string_conversion.hpp": "platform/default/include/jni/string_conversion.hpp", + "mbgl/gl/headless_backend.hpp": "platform/default/include/mbgl/gl/headless_backend.hpp", + "mbgl/gl/headless_frontend.hpp": "platform/default/include/mbgl/gl/headless_frontend.hpp", + "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp", + "mbgl/text/unaccent.hpp": "platform/default/include/mbgl/text/unaccent.hpp", + "mbgl/util/default_thread_pool.hpp": "platform/default/include/mbgl/util/default_thread_pool.hpp", + "mbgl/util/shared_thread_pool.hpp": "platform/default/include/mbgl/util/shared_thread_pool.hpp" + }, + "private_headers": { + "android_renderer_backend.hpp": "platform/android/src/android_renderer_backend.hpp", + "android_renderer_frontend.hpp": "platform/android/src/android_renderer_frontend.hpp", + "annotation/marker.hpp": "platform/android/src/annotation/marker.hpp", + "annotation/multi_point.hpp": "platform/android/src/annotation/multi_point.hpp", + "annotation/polygon.hpp": "platform/android/src/annotation/polygon.hpp", + "annotation/polyline.hpp": "platform/android/src/annotation/polyline.hpp", + "attach_env.hpp": "platform/android/src/attach_env.hpp", + "bitmap.hpp": "platform/android/src/bitmap.hpp", + "bitmap_factory.hpp": "platform/android/src/bitmap_factory.hpp", + "conversion/collection.hpp": "platform/android/src/conversion/collection.hpp", + "conversion/color.hpp": "platform/android/src/conversion/color.hpp", + "conversion/constant.hpp": "platform/android/src/conversion/constant.hpp", + "conversion/conversion.hpp": "platform/android/src/conversion/conversion.hpp", + "geojson/feature.hpp": "platform/android/src/geojson/feature.hpp", + "geojson/feature_collection.hpp": "platform/android/src/geojson/feature_collection.hpp", + "geojson/geometry.hpp": "platform/android/src/geojson/geometry.hpp", + "geojson/geometry_collection.hpp": "platform/android/src/geojson/geometry_collection.hpp", + "geojson/line_string.hpp": "platform/android/src/geojson/line_string.hpp", + "geojson/multi_line_string.hpp": "platform/android/src/geojson/multi_line_string.hpp", + "geojson/multi_polygon.hpp": "platform/android/src/geojson/multi_polygon.hpp", + "geojson/point.hpp": "platform/android/src/geojson/point.hpp", + "geojson/polygon.hpp": "platform/android/src/geojson/polygon.hpp", + "geojson/util.hpp": "platform/android/src/geojson/util.hpp", + "geometry/lat_lng.hpp": "platform/android/src/geometry/lat_lng.hpp", + "geometry/lat_lng_bounds.hpp": "platform/android/src/geometry/lat_lng_bounds.hpp", + "geometry/lat_lng_quad.hpp": "platform/android/src/geometry/lat_lng_quad.hpp", + "geometry/projected_meters.hpp": "platform/android/src/geometry/projected_meters.hpp", + "graphics/pointf.hpp": "platform/android/src/graphics/pointf.hpp", + "graphics/rectf.hpp": "platform/android/src/graphics/rectf.hpp", + "gson/json_array.hpp": "platform/android/src/gson/json_array.hpp", + "gson/json_element.hpp": "platform/android/src/gson/json_element.hpp", + "gson/json_object.hpp": "platform/android/src/gson/json_object.hpp", + "gson/json_primitive.hpp": "platform/android/src/gson/json_primitive.hpp", + "java/util.hpp": "platform/android/src/java/util.hpp", + "java_types.hpp": "platform/android/src/java_types.hpp", + "jni.hpp": "platform/android/src/jni.hpp", + "logger.hpp": "platform/android/src/logger.hpp", + "map/camera_position.hpp": "platform/android/src/map/camera_position.hpp", + "map/image.hpp": "platform/android/src/map/image.hpp", + "map_renderer.hpp": "platform/android/src/map_renderer.hpp", + "map_renderer_runnable.hpp": "platform/android/src/map_renderer_runnable.hpp", + "native_map_view.hpp": "platform/android/src/native_map_view.hpp", + "run_loop_impl.hpp": "platform/android/src/run_loop_impl.hpp", + "snapshotter/map_snapshot.hpp": "platform/android/src/snapshotter/map_snapshot.hpp", + "snapshotter/map_snapshotter.hpp": "platform/android/src/snapshotter/map_snapshotter.hpp", + "style/android_conversion.hpp": "platform/android/src/style/android_conversion.hpp", + "style/conversion/filter.hpp": "platform/android/src/style/conversion/filter.hpp", + "style/conversion/position.hpp": "platform/android/src/style/conversion/position.hpp", + "style/conversion/property_expression.hpp": "platform/android/src/style/conversion/property_expression.hpp", + "style/conversion/property_value.hpp": "platform/android/src/style/conversion/property_value.hpp", + "style/conversion/transition_options.hpp": "platform/android/src/style/conversion/transition_options.hpp", + "style/conversion/url_or_tileset.hpp": "platform/android/src/style/conversion/url_or_tileset.hpp", + "style/formatted.hpp": "platform/android/src/style/formatted.hpp", + "style/formatted_section.hpp": "platform/android/src/style/formatted_section.hpp", + "style/layers/background_layer.hpp": "platform/android/src/style/layers/background_layer.hpp", + "style/layers/circle_layer.hpp": "platform/android/src/style/layers/circle_layer.hpp", + "style/layers/custom_layer.hpp": "platform/android/src/style/layers/custom_layer.hpp", + "style/layers/fill_extrusion_layer.hpp": "platform/android/src/style/layers/fill_extrusion_layer.hpp", + "style/layers/fill_layer.hpp": "platform/android/src/style/layers/fill_layer.hpp", + "style/layers/heatmap_layer.hpp": "platform/android/src/style/layers/heatmap_layer.hpp", + "style/layers/hillshade_layer.hpp": "platform/android/src/style/layers/hillshade_layer.hpp", + "style/layers/layer.hpp": "platform/android/src/style/layers/layer.hpp", + "style/layers/layer_manager.hpp": "platform/android/src/style/layers/layer_manager.hpp", + "style/layers/line_layer.hpp": "platform/android/src/style/layers/line_layer.hpp", + "style/layers/raster_layer.hpp": "platform/android/src/style/layers/raster_layer.hpp", + "style/layers/symbol_layer.hpp": "platform/android/src/style/layers/symbol_layer.hpp", + "style/light.hpp": "platform/android/src/style/light.hpp", + "style/position.hpp": "platform/android/src/style/position.hpp", + "style/sources/custom_geometry_source.hpp": "platform/android/src/style/sources/custom_geometry_source.hpp", + "style/sources/geojson_source.hpp": "platform/android/src/style/sources/geojson_source.hpp", + "style/sources/image_source.hpp": "platform/android/src/style/sources/image_source.hpp", + "style/sources/raster_dem_source.hpp": "platform/android/src/style/sources/raster_dem_source.hpp", + "style/sources/raster_source.hpp": "platform/android/src/style/sources/raster_source.hpp", + "style/sources/source.hpp": "platform/android/src/style/sources/source.hpp", + "style/sources/unknown_source.hpp": "platform/android/src/style/sources/unknown_source.hpp", + "style/sources/vector_source.hpp": "platform/android/src/style/sources/vector_source.hpp", + "style/transition_options.hpp": "platform/android/src/style/transition_options.hpp", + "style/value.hpp": "platform/android/src/style/value.hpp", + "text/collator_jni.hpp": "platform/android/src/text/collator_jni.hpp", + "text/local_glyph_rasterizer_jni.hpp": "platform/android/src/text/local_glyph_rasterizer_jni.hpp" + } +} diff --git a/platform/android/core-files.txt b/platform/android/core-files.txt deleted file mode 100644 index bc31c035c5..0000000000 --- a/platform/android/core-files.txt +++ /dev/null @@ -1,223 +0,0 @@ -# JNI overrides -platform/default/include/jni/string_conversion.hpp - -# Loop -platform/android/src/async_task.cpp -platform/android/src/run_loop.cpp -platform/android/src/run_loop_impl.hpp -platform/android/src/timer.cpp - -# Misc -platform/android/src/text/collator.cpp -platform/android/src/text/collator_jni.hpp -platform/android/src/text/local_glyph_rasterizer.cpp -platform/android/src/text/local_glyph_rasterizer_jni.hpp -platform/android/src/logging_android.cpp -platform/android/src/thread.cpp -platform/android/src/string_util.cpp -platform/default/src/mbgl/text/bidi.cpp -platform/default/src/mbgl/util/thread_local.cpp -platform/android/src/unaccent.cpp -platform/default/include/mbgl/text/unaccent.hpp -platform/default/src/mbgl/util/utf.cpp - -# Image handling -platform/default/src/mbgl/util/png_writer.cpp -platform/android/src/bitmap.cpp -platform/android/src/bitmap.hpp -platform/android/src/bitmap_factory.cpp -platform/android/src/bitmap_factory.hpp -platform/android/src/image.cpp - -# Thread pool -platform/default/src/mbgl/util/shared_thread_pool.cpp -platform/default/include/mbgl/util/shared_thread_pool.hpp -platform/default/src/mbgl/util/default_thread_pool.cpp -platform/default/include/mbgl/util/default_thread_pool.hpp - -# Rendering -platform/android/src/android_renderer_backend.cpp -platform/android/src/android_renderer_backend.hpp -platform/android/src/android_renderer_frontend.cpp -platform/android/src/android_renderer_frontend.hpp - -# Snapshots (core) -platform/default/src/mbgl/gl/headless_backend.cpp -platform/default/include/mbgl/gl/headless_backend.hpp -platform/default/src/mbgl/gl/headless_frontend.cpp -platform/default/include/mbgl/gl/headless_frontend.hpp -platform/default/src/mbgl/map/map_snapshotter.cpp -platform/default/include/mbgl/map/map_snapshotter.hpp -platform/linux/src/headless_backend_egl.cpp - -# Conversion C++ -> Java -platform/android/src/conversion/collection.cpp -platform/android/src/conversion/collection.hpp -platform/android/src/conversion/color.cpp -platform/android/src/conversion/color.hpp -platform/android/src/conversion/constant.cpp -platform/android/src/conversion/constant.hpp -platform/android/src/conversion/conversion.hpp -platform/android/src/style/conversion/filter.cpp -platform/android/src/style/conversion/filter.hpp -platform/android/src/style/conversion/position.cpp -platform/android/src/style/conversion/position.hpp -platform/android/src/style/conversion/property_expression.hpp -platform/android/src/style/conversion/property_value.hpp -platform/android/src/style/conversion/transition_options.cpp -platform/android/src/style/conversion/transition_options.hpp -platform/android/src/style/conversion/url_or_tileset.cpp -platform/android/src/style/conversion/url_or_tileset.hpp -platform/android/src/map/camera_position.cpp -platform/android/src/map/camera_position.hpp -platform/android/src/map/image.cpp -platform/android/src/map/image.hpp - -# Style conversion Java -> C++ -platform/android/src/style/android_conversion.hpp -platform/android/src/style/value.cpp -platform/android/src/style/value.hpp - -# Style -platform/android/src/style/transition_options.cpp -platform/android/src/style/transition_options.hpp -platform/android/src/style/layers/background_layer.cpp -platform/android/src/style/layers/background_layer.hpp -platform/android/src/style/layers/circle_layer.cpp -platform/android/src/style/layers/circle_layer.hpp -platform/android/src/style/layers/custom_layer.cpp -platform/android/src/style/layers/custom_layer.hpp -platform/android/src/style/layers/fill_extrusion_layer.cpp -platform/android/src/style/layers/fill_extrusion_layer.hpp -platform/android/src/style/layers/fill_layer.cpp -platform/android/src/style/layers/fill_layer.hpp -platform/android/src/style/layers/heatmap_layer.cpp -platform/android/src/style/layers/heatmap_layer.hpp -platform/android/src/style/layers/hillshade_layer.cpp -platform/android/src/style/layers/hillshade_layer.hpp -platform/android/src/style/layers/layer.cpp -platform/android/src/style/layers/layer.hpp -platform/android/src/style/layers/layer_manager.cpp -platform/android/src/style/layers/layer_manager.hpp -platform/android/src/style/layers/line_layer.cpp -platform/android/src/style/layers/line_layer.hpp -platform/android/src/style/layers/raster_layer.cpp -platform/android/src/style/layers/raster_layer.hpp -platform/android/src/style/layers/symbol_layer.cpp -platform/android/src/style/layers/symbol_layer.hpp -platform/android/src/style/sources/geojson_source.cpp -platform/android/src/style/sources/geojson_source.hpp -platform/android/src/style/sources/custom_geometry_source.cpp -platform/android/src/style/sources/custom_geometry_source.hpp -platform/android/src/style/sources/source.cpp -platform/android/src/style/sources/source.hpp -platform/android/src/style/sources/raster_source.cpp -platform/android/src/style/sources/raster_source.hpp -platform/android/src/style/sources/unknown_source.cpp -platform/android/src/style/sources/unknown_source.hpp -platform/android/src/style/sources/vector_source.cpp -platform/android/src/style/sources/vector_source.hpp -platform/android/src/style/sources/image_source.hpp -platform/android/src/style/sources/image_source.cpp -platform/android/src/style/sources/raster_dem_source.cpp -platform/android/src/style/sources/raster_dem_source.hpp -platform/android/src/style/position.cpp -platform/android/src/style/position.hpp -platform/android/src/style/light.cpp -platform/android/src/style/light.hpp -platform/android/src/style/formatted.cpp -platform/android/src/style/formatted.hpp -platform/android/src/style/formatted_section.cpp -platform/android/src/style/formatted_section.hpp - -# Native map -platform/android/src/native_map_view.cpp -platform/android/src/native_map_view.hpp -platform/android/src/map_renderer.cpp -platform/android/src/map_renderer.hpp -platform/android/src/map_renderer_runnable.cpp -platform/android/src/map_renderer_runnable.hpp - -# Java core classes -platform/android/src/java/util.cpp -platform/android/src/java/util.hpp - -# Graphics -platform/android/src/graphics/pointf.cpp -platform/android/src/graphics/pointf.hpp -platform/android/src/graphics/rectf.cpp -platform/android/src/graphics/rectf.hpp - -# GeoJSON -platform/android/src/geojson/feature.cpp -platform/android/src/geojson/feature.hpp -platform/android/src/geojson/feature_collection.cpp -platform/android/src/geojson/feature_collection.hpp -platform/android/src/geojson/geometry.cpp -platform/android/src/geojson/geometry.hpp -platform/android/src/geojson/geometry_collection.cpp -platform/android/src/geojson/geometry_collection.hpp -platform/android/src/geojson/line_string.cpp -platform/android/src/geojson/line_string.hpp -platform/android/src/geojson/multi_line_string.cpp -platform/android/src/geojson/multi_line_string.hpp -platform/android/src/geojson/multi_point.cpp -platform/android/src/geojson/multi_polygon.cpp -platform/android/src/geojson/multi_polygon.hpp -platform/android/src/geojson/point.cpp -platform/android/src/geojson/point.hpp -platform/android/src/geojson/polygon.cpp -platform/android/src/geojson/polygon.hpp -platform/android/src/geojson/util.hpp - -# Geometry -platform/android/src/geometry/lat_lng.cpp -platform/android/src/geometry/lat_lng.hpp -platform/android/src/geometry/lat_lng_bounds.cpp -platform/android/src/geometry/lat_lng_bounds.hpp -platform/android/src/geometry/lat_lng_quad.cpp -platform/android/src/geometry/lat_lng_quad.hpp -platform/android/src/geometry/projected_meters.cpp -platform/android/src/geometry/projected_meters.hpp - -# GSon -platform/android/src/gson/json_array.cpp -platform/android/src/gson/json_array.hpp -platform/android/src/gson/json_element.cpp -platform/android/src/gson/json_element.hpp -platform/android/src/gson/json_object.cpp -platform/android/src/gson/json_object.hpp -platform/android/src/gson/json_primitive.cpp -platform/android/src/gson/json_primitive.hpp - -# Annotation -platform/android/src/annotation/marker.cpp -platform/android/src/annotation/marker.hpp -platform/android/src/annotation/multi_point.hpp -platform/android/src/annotation/polygon.cpp -platform/android/src/annotation/polygon.hpp -platform/android/src/annotation/polyline.cpp -platform/android/src/annotation/polyline.hpp - -# Snapshots (SDK) -platform/android/src/snapshotter/map_snapshotter.cpp -platform/android/src/snapshotter/map_snapshotter.hpp -platform/android/src/snapshotter/map_snapshot.cpp -platform/android/src/snapshotter/map_snapshot.hpp - -# Logger -platform/android/src/logger.cpp -platform/android/src/logger.hpp - -# Main jni bindings -platform/android/src/attach_env.cpp -platform/android/src/attach_env.hpp -platform/android/src/java_types.cpp -platform/android/src/java_types.hpp - -# Main entry point -platform/android/src/jni.hpp -platform/android/src/jni.cpp - -# GL -platform/android/mbgl/gl/gl_impl.hpp diff --git a/platform/android/filesource-files.json b/platform/android/filesource-files.json new file mode 100644 index 0000000000..ab92c2c326 --- /dev/null +++ b/platform/android/filesource-files.json @@ -0,0 +1,27 @@ +{ + "//": "This file can be edited manually and is the canonical source.", + "sources": [ + "platform/android/src/asset_manager_file_source.cpp", + "platform/android/src/connectivity_listener.cpp", + "platform/android/src/file_source.cpp", + "platform/android/src/http_file_source.cpp", + "platform/android/src/offline/offline_manager.cpp", + "platform/android/src/offline/offline_region.cpp", + "platform/android/src/offline/offline_region_definition.cpp", + "platform/android/src/offline/offline_region_error.cpp", + "platform/android/src/offline/offline_region_status.cpp", + "platform/default/src/mbgl/storage/sqlite3.cpp" + ], + "public_headers": {}, + "private_headers": { + "asset_manager.hpp": "platform/android/src/asset_manager.hpp", + "asset_manager_file_source.hpp": "platform/android/src/asset_manager_file_source.hpp", + "connectivity_listener.hpp": "platform/android/src/connectivity_listener.hpp", + "file_source.hpp": "platform/android/src/file_source.hpp", + "offline/offline_manager.hpp": "platform/android/src/offline/offline_manager.hpp", + "offline/offline_region.hpp": "platform/android/src/offline/offline_region.hpp", + "offline/offline_region_definition.hpp": "platform/android/src/offline/offline_region_definition.hpp", + "offline/offline_region_error.hpp": "platform/android/src/offline/offline_region_error.hpp", + "offline/offline_region_status.hpp": "platform/android/src/offline/offline_region_status.hpp" + } +} diff --git a/platform/android/filesource-files.txt b/platform/android/filesource-files.txt deleted file mode 100644 index 2485e2a7ed..0000000000 --- a/platform/android/filesource-files.txt +++ /dev/null @@ -1,28 +0,0 @@ -# File source -platform/android/src/http_file_source.cpp -platform/android/src/asset_manager.hpp -platform/android/src/asset_manager_file_source.cpp -platform/android/src/asset_manager_file_source.hpp - -# FileSource holder -platform/android/src/file_source.cpp -platform/android/src/file_source.hpp - -# Connectivity -platform/android/src/connectivity_listener.cpp -platform/android/src/connectivity_listener.hpp - -# Offline -platform/android/src/offline/offline_manager.cpp -platform/android/src/offline/offline_manager.hpp -platform/android/src/offline/offline_region.cpp -platform/android/src/offline/offline_region.hpp -platform/android/src/offline/offline_region_definition.cpp -platform/android/src/offline/offline_region_definition.hpp -platform/android/src/offline/offline_region_error.cpp -platform/android/src/offline/offline_region_error.hpp -platform/android/src/offline/offline_region_status.cpp -platform/android/src/offline/offline_region_status.hpp - -# Database -platform/default/src/mbgl/storage/sqlite3.cpp diff --git a/platform/android/mbgl/gl/gl_impl.hpp b/platform/android/include/mbgl/gl/gl_impl.hpp index b9b5d8e315..b9b5d8e315 100644 --- a/platform/android/mbgl/gl/gl_impl.hpp +++ b/platform/android/include/mbgl/gl/gl_impl.hpp |