diff options
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 27f538b95e..3d3728aed7 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -15,7 +15,7 @@ if ((ANDROID_ABI STREQUAL "armeabi") OR (ANDROID_ABI STREQUAL "armeabi-v7a") OR set(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=gold -Wl,--icf=safe ${CMAKE_SHARED_LINKER_FLAGS}") endif() -mason_use(jni.hpp VERSION 2.0.0-1 HEADER_ONLY) +mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY) mason_use(libzip VERSION 1.1.3) mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) @@ -49,8 +49,6 @@ macro(mbgl_platform_core) PRIVATE platform/default/default_file_source.cpp PRIVATE platform/default/local_file_source.cpp PRIVATE platform/default/online_file_source.cpp - PRIVATE platform/android/src/default_file_source.cpp - PRIVATE platform/android/src/default_file_source.hpp # Offline # PRIVATE include/mbgl/storage/offline.hpp @@ -137,6 +135,10 @@ macro(mbgl_platform_core) platform/android/src/style/functions/interval_stops.cpp platform/android/src/style/functions/interval_stops.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 @@ -145,6 +147,46 @@ macro(mbgl_platform_core) platform/android/src/native_map_view.cpp platform/android/src/native_map_view.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 + + # Geometry + platform/android/src/geometry/feature.cpp + platform/android/src/geometry/feature.hpp + 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/projected_meters.cpp + platform/android/src/geometry/projected_meters.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 + # Main jni bindings platform/android/src/attach_env.cpp platform/android/src/attach_env.hpp |