[build] simplify Android build

1 files changed, 178 insertions, 186 deletions

diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index bd65bc517f..e76a447c88 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -83,6 +83,160 @@ macro(mbgl_platform_core)
         PRIVATE platform/default/mbgl/map/map_snapshotter.cpp
         PRIVATE platform/default/mbgl/map/map_snapshotter.hpp
         PRIVATE platform/linux/src/headless_backend_egl.cpp
+
+        # Conversion C++ -> Java
+        PRIVATE platform/android/src/conversion/constant.hpp
+        PRIVATE platform/android/src/conversion/conversion.hpp
+        PRIVATE platform/android/src/style/conversion/property_expression.hpp
+        PRIVATE platform/android/src/style/conversion/property_value.hpp
+        PRIVATE platform/android/src/style/conversion/types.hpp
+        PRIVATE platform/android/src/style/conversion/types_string_values.hpp
+        PRIVATE platform/android/src/map/camera_position.cpp
+        PRIVATE platform/android/src/map/camera_position.hpp
+        PRIVATE platform/android/src/map/image.cpp
+        PRIVATE platform/android/src/map/image.hpp
+
+        # Style conversion Java -> C++
+        PRIVATE platform/android/src/style/android_conversion.hpp
+        PRIVATE platform/android/src/style/value.cpp
+        PRIVATE platform/android/src/style/value.hpp
+        PRIVATE platform/android/src/style/conversion/url_or_tileset.hpp
+
+        # Style
+        PRIVATE platform/android/src/style/transition_options.cpp
+        PRIVATE platform/android/src/style/transition_options.hpp
+        PRIVATE platform/android/src/style/layers/background_layer.cpp
+        PRIVATE platform/android/src/style/layers/background_layer.hpp
+        PRIVATE platform/android/src/style/layers/circle_layer.cpp
+        PRIVATE platform/android/src/style/layers/circle_layer.hpp
+        PRIVATE platform/android/src/style/layers/custom_layer.cpp
+        PRIVATE platform/android/src/style/layers/custom_layer.hpp
+        PRIVATE platform/android/src/style/layers/fill_extrusion_layer.cpp
+        PRIVATE platform/android/src/style/layers/fill_extrusion_layer.hpp
+        PRIVATE platform/android/src/style/layers/fill_layer.cpp
+        PRIVATE platform/android/src/style/layers/fill_layer.hpp
+        PRIVATE platform/android/src/style/layers/heatmap_layer.cpp
+        PRIVATE platform/android/src/style/layers/heatmap_layer.hpp
+        PRIVATE platform/android/src/style/layers/hillshade_layer.cpp
+        PRIVATE platform/android/src/style/layers/hillshade_layer.hpp
+        PRIVATE platform/android/src/style/layers/layer.cpp
+        PRIVATE platform/android/src/style/layers/layer.hpp
+        PRIVATE platform/android/src/style/layers/layers.cpp
+        PRIVATE platform/android/src/style/layers/layers.hpp
+        PRIVATE platform/android/src/style/layers/line_layer.cpp
+        PRIVATE platform/android/src/style/layers/line_layer.hpp
+        PRIVATE platform/android/src/style/layers/raster_layer.cpp
+        PRIVATE platform/android/src/style/layers/raster_layer.hpp
+        PRIVATE platform/android/src/style/layers/symbol_layer.cpp
+        PRIVATE platform/android/src/style/layers/symbol_layer.hpp
+        PRIVATE platform/android/src/style/layers/unknown_layer.cpp
+        PRIVATE platform/android/src/style/layers/unknown_layer.hpp
+        PRIVATE platform/android/src/style/sources/geojson_source.cpp
+        PRIVATE platform/android/src/style/sources/geojson_source.hpp
+        PRIVATE platform/android/src/style/sources/custom_geometry_source.cpp
+        PRIVATE platform/android/src/style/sources/custom_geometry_source.hpp
+        PRIVATE platform/android/src/style/sources/source.cpp
+        PRIVATE platform/android/src/style/sources/source.hpp
+        PRIVATE platform/android/src/style/sources/raster_source.cpp
+        PRIVATE platform/android/src/style/sources/raster_source.hpp
+        PRIVATE platform/android/src/style/sources/unknown_source.cpp
+        PRIVATE platform/android/src/style/sources/unknown_source.hpp
+        PRIVATE platform/android/src/style/sources/vector_source.cpp
+        PRIVATE platform/android/src/style/sources/vector_source.hpp
+        PRIVATE platform/android/src/style/sources/image_source.hpp
+        PRIVATE platform/android/src/style/sources/image_source.cpp
+        PRIVATE platform/android/src/style/sources/raster_dem_source.cpp
+        PRIVATE platform/android/src/style/sources/raster_dem_source.hpp
+        PRIVATE platform/android/src/style/position.cpp
+        PRIVATE platform/android/src/style/position.hpp
+        PRIVATE platform/android/src/style/light.cpp
+        PRIVATE platform/android/src/style/light.hpp
+
+        # Native map
+        PRIVATE platform/android/src/native_map_view.cpp
+        PRIVATE platform/android/src/native_map_view.hpp
+        PRIVATE platform/android/src/map_renderer.cpp
+        PRIVATE platform/android/src/map_renderer.hpp
+        PRIVATE platform/android/src/map_renderer_runnable.cpp
+        PRIVATE platform/android/src/map_renderer_runnable.hpp
+
+        # Java core classes
+        PRIVATE platform/android/src/java/lang.cpp
+        PRIVATE platform/android/src/java/lang.hpp
+        PRIVATE platform/android/src/java/util.cpp
+        PRIVATE platform/android/src/java/util.hpp
+
+        # Graphics
+        PRIVATE platform/android/src/graphics/pointf.cpp
+        PRIVATE platform/android/src/graphics/pointf.hpp
+        PRIVATE platform/android/src/graphics/rectf.cpp
+        PRIVATE platform/android/src/graphics/rectf.hpp
+
+        # GeoJSON
+        PRIVATE platform/android/src/geojson/feature.cpp
+        PRIVATE platform/android/src/geojson/feature.hpp
+        PRIVATE platform/android/src/geojson/feature_collection.cpp
+        PRIVATE platform/android/src/geojson/feature_collection.hpp
+        PRIVATE platform/android/src/geojson/geometry.cpp
+        PRIVATE platform/android/src/geojson/geometry.hpp
+        PRIVATE platform/android/src/geojson/geometry_collection.cpp
+        PRIVATE platform/android/src/geojson/geometry_collection.hpp
+        PRIVATE platform/android/src/geojson/line_string.cpp
+        PRIVATE platform/android/src/geojson/line_string.hpp
+        PRIVATE platform/android/src/geojson/multi_line_string.cpp
+        PRIVATE platform/android/src/geojson/multi_line_string.hpp
+        PRIVATE platform/android/src/geojson/multi_point.cpp
+        PRIVATE platform/android/src/geojson/multi_point.hpp
+        PRIVATE platform/android/src/geojson/multi_polygon.cpp
+        PRIVATE platform/android/src/geojson/multi_polygon.hpp
+        PRIVATE platform/android/src/geojson/point.cpp
+        PRIVATE platform/android/src/geojson/point.hpp
+        PRIVATE platform/android/src/geojson/polygon.cpp
+        PRIVATE platform/android/src/geojson/polygon.hpp
+
+        # Geometry
+        PRIVATE platform/android/src/geometry/lat_lng.cpp
+        PRIVATE platform/android/src/geometry/lat_lng.hpp
+        PRIVATE platform/android/src/geometry/lat_lng_bounds.cpp
+        PRIVATE platform/android/src/geometry/lat_lng_bounds.hpp
+        PRIVATE platform/android/src/geometry/lat_lng_quad.cpp
+        PRIVATE platform/android/src/geometry/lat_lng_quad.hpp
+        PRIVATE platform/android/src/geometry/projected_meters.cpp
+        PRIVATE platform/android/src/geometry/projected_meters.hpp
+
+        # GSon
+        PRIVATE platform/android/src/gson/json_array.cpp
+        PRIVATE platform/android/src/gson/json_array.hpp
+        PRIVATE platform/android/src/gson/json_element.cpp
+        PRIVATE platform/android/src/gson/json_element.hpp
+        PRIVATE platform/android/src/gson/json_object.cpp
+        PRIVATE platform/android/src/gson/json_object.hpp
+        PRIVATE platform/android/src/gson/json_primitive.cpp
+        PRIVATE platform/android/src/gson/json_primitive.hpp
+
+        # Annotation
+        PRIVATE platform/android/src/annotation/marker.cpp
+        PRIVATE platform/android/src/annotation/marker.hpp
+        PRIVATE platform/android/src/annotation/polygon.cpp
+        PRIVATE platform/android/src/annotation/polygon.hpp
+        PRIVATE platform/android/src/annotation/polyline.cpp
+        PRIVATE platform/android/src/annotation/polyline.hpp
+
+        # Snapshots (SDK)
+        PRIVATE platform/android/src/snapshotter/map_snapshotter.cpp
+        PRIVATE platform/android/src/snapshotter/map_snapshotter.hpp
+        PRIVATE platform/android/src/snapshotter/map_snapshot.cpp
+        PRIVATE platform/android/src/snapshotter/map_snapshot.hpp
+
+        # Main jni bindings
+        PRIVATE platform/android/src/attach_env.cpp
+        PRIVATE platform/android/src/attach_env.hpp
+        PRIVATE platform/android/src/java_types.cpp
+        PRIVATE platform/android/src/java_types.hpp
+
+        # Main entry point
+        PRIVATE platform/android/src/jni.hpp
+        PRIVATE platform/android/src/jni.cpp
     )
 
     target_include_directories(mbgl-core
@@ -118,6 +272,26 @@ macro(mbgl_filesource)
         PRIVATE platform/android/src/asset_manager_file_source.cpp
         PRIVATE platform/android/src/asset_manager_file_source.hpp
 
+        # FileSource holder
+        PRIVATE platform/android/src/file_source.cpp
+        PRIVATE platform/android/src/file_source.hpp
+
+        # Connectivity
+        PRIVATE platform/android/src/connectivity_listener.cpp
+        PRIVATE platform/android/src/connectivity_listener.hpp
+
+        # Offline
+        PRIVATE platform/android/src/offline/offline_manager.cpp
+        PRIVATE platform/android/src/offline/offline_manager.hpp
+        PRIVATE platform/android/src/offline/offline_region.cpp
+        PRIVATE platform/android/src/offline/offline_region.hpp
+        PRIVATE platform/android/src/offline/offline_region_definition.cpp
+        PRIVATE platform/android/src/offline/offline_region_definition.hpp
+        PRIVATE platform/android/src/offline/offline_region_error.cpp
+        PRIVATE platform/android/src/offline/offline_region_error.hpp
+        PRIVATE platform/android/src/offline/offline_region_status.cpp
+        PRIVATE platform/android/src/offline/offline_region_status.hpp
+
         # Database
         PRIVATE platform/default/sqlite3.cpp
     )
@@ -133,190 +307,6 @@ macro(mbgl_filesource)
     )
 endmacro()
 
-
-## Main library ##
-
-add_library(mbgl-android STATIC
-    # Conversion C++ -> Java
-    platform/android/src/conversion/constant.hpp
-    platform/android/src/conversion/conversion.hpp
-    platform/android/src/style/conversion/property_expression.hpp
-    platform/android/src/style/conversion/property_value.hpp
-    platform/android/src/style/conversion/types.hpp
-    platform/android/src/style/conversion/types_string_values.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
-    platform/android/src/style/conversion/url_or_tileset.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/layers.cpp
-    platform/android/src/style/layers/layers.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/layers/unknown_layer.cpp
-    platform/android/src/style/layers/unknown_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
-
-    # 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
-
-    # 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/lang.cpp
-    platform/android/src/java/lang.hpp
-    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_point.hpp
-    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
-
-    # 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/polygon.cpp
-    platform/android/src/annotation/polygon.hpp
-    platform/android/src/annotation/polyline.cpp
-    platform/android/src/annotation/polyline.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
-
-    # 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
-
-    # 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
-)
-
-target_link_libraries(mbgl-android
-    PUBLIC mbgl-filesource
-    PUBLIC mbgl-core
-)
-
 ## Shared library
 
 add_library(mapbox-gl SHARED
@@ -324,7 +314,8 @@ add_library(mapbox-gl SHARED
 )
 
 target_link_libraries(mapbox-gl
-    PRIVATE mbgl-android
+    PRIVATE mbgl-core
+    PRIVATE mbgl-filesource
 )
 
 ## Test library ##
@@ -343,7 +334,8 @@ macro(mbgl_platform_test)
     )
 
     target_link_libraries(mbgl-test
-        PRIVATE mbgl-android
+        PRIVATE mbgl-core
+        PRIVATE mbgl-filesource
     )
 endmacro()