diff options
Diffstat (limited to 'next/platform/android/android.cmake')
| -rw-r--r-- | next/platform/android/android.cmake | 73 |
1 files changed, 60 insertions, 13 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 70683149d0..06183291db 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -40,8 +40,6 @@ target_sources( ${MBGL_ROOT}/platform/android/src/conversion/constant.cpp ${MBGL_ROOT}/platform/android/src/conversion/constant.hpp ${MBGL_ROOT}/platform/android/src/conversion/conversion.hpp - ${MBGL_ROOT}/platform/android/src/file_source.cpp - ${MBGL_ROOT}/platform/android/src/file_source.hpp ${MBGL_ROOT}/platform/android/src/geojson/feature.cpp ${MBGL_ROOT}/platform/android/src/geojson/feature.hpp ${MBGL_ROOT}/platform/android/src/geojson/feature_collection.cpp @@ -94,9 +92,8 @@ target_sources( ${MBGL_ROOT}/platform/android/src/jni.hpp ${MBGL_ROOT}/platform/android/src/jni_native.cpp ${MBGL_ROOT}/platform/android/src/jni_native.hpp - ${MBGL_ROOT}/platform/android/src/logger.cpp - ${MBGL_ROOT}/platform/android/src/logger.hpp - ${MBGL_ROOT}/platform/android/src/logging_android.cpp + ${MBGL_ROOT}/platform/android/src/mapbox.cpp + ${MBGL_ROOT}/platform/android/src/mapbox.hpp ${MBGL_ROOT}/platform/android/src/map/camera_position.cpp ${MBGL_ROOT}/platform/android/src/map/camera_position.hpp ${MBGL_ROOT}/platform/android/src/map/image.cpp @@ -187,15 +184,8 @@ target_sources( ${MBGL_ROOT}/platform/android/src/style/transition_options.hpp ${MBGL_ROOT}/platform/android/src/style/value.cpp ${MBGL_ROOT}/platform/android/src/style/value.hpp - ${MBGL_ROOT}/platform/android/src/text/collator.cpp - ${MBGL_ROOT}/platform/android/src/text/collator_jni.hpp - ${MBGL_ROOT}/platform/android/src/text/format_number.cpp - ${MBGL_ROOT}/platform/android/src/text/format_number_jni.hpp - ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer.cpp - ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer_jni.hpp ${MBGL_ROOT}/platform/android/src/thread.cpp ${MBGL_ROOT}/platform/android/src/timer.cpp - ${MBGL_ROOT}/platform/android/src/unaccent.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_backend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_frontend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gl/headless_backend.cpp @@ -212,6 +202,7 @@ target_sources( ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp ${MBGL_ROOT}/platform/default/src/mbgl/text/bidi.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/util/monotonic_timer.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/png_writer.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/thread_local.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/utf.cpp @@ -242,13 +233,43 @@ target_link_libraries( ) add_library( + mbgl-core-android STATIC + ${MBGL_ROOT}/platform/android/src/file_source.cpp + ${MBGL_ROOT}/platform/android/src/file_source.hpp + ${MBGL_ROOT}/platform/android/src/i18n/collator.cpp + ${MBGL_ROOT}/platform/android/src/i18n/collator_jni.hpp + ${MBGL_ROOT}/platform/android/src/i18n/number_format.cpp + ${MBGL_ROOT}/platform/android/src/i18n/number_format_jni.hpp + ${MBGL_ROOT}/platform/android/src/logger.cpp + ${MBGL_ROOT}/platform/android/src/logger.hpp + ${MBGL_ROOT}/platform/android/src/logging_android.cpp + ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer.cpp + ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer_jni.hpp +) + +target_include_directories( + mbgl-core-android + PRIVATE ${MBGL_ROOT}/platform/default/include ${MBGL_ROOT}/src +) + +target_link_libraries( + mbgl-core-android + PRIVATE Mapbox::Base::jni.hpp mbgl-core +) + +add_library( mapbox-gl SHARED ${MBGL_ROOT}/platform/android/src/main.cpp ) +target_include_directories( + mapbox-gl + PRIVATE ${MBGL_ROOT}/platform/default/include ${MBGL_ROOT}/src +) + target_link_libraries( mapbox-gl - PRIVATE Mapbox::Base::jni.hpp mbgl-core + PRIVATE Mapbox::Base::jni.hpp mbgl-core mbgl-core-android ) add_library( @@ -267,6 +288,7 @@ target_link_libraries( GLESv2 Mapbox::Base::optional Mapbox::Base::typewrapper + Mapbox::Base::value Mapbox::Base::weak log ) @@ -293,15 +315,40 @@ target_link_libraries( PRIVATE Mapbox::Base::jni.hpp mapbox-gl mbgl-benchmark ) +add_library( + mbgl-render-test-runner SHARED + ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c + ${MBGL_ROOT}/platform/android/src/test/render_test_runner.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp + ${MBGL_ROOT}/platform/android/src/test/render_test_collator.cpp + ${MBGL_ROOT}/platform/android/src/test/render_test_number_format.cpp +) + +target_include_directories( + mbgl-render-test-runner + PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${MBGL_ROOT}/platform/android/src ${MBGL_ROOT}/src +) + +target_link_libraries( + mbgl-render-test-runner + PRIVATE + Mapbox::Base::jni.hpp + android + log + mbgl-render-test +) + # Android has no concept of MinSizeRel on android.toolchain.cmake and provides configurations tuned for binary size. We can push it a bit # more with code folding and LTO. set_target_properties(example-custom-layer PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") set_target_properties(mapbox-gl PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") set_target_properties(mbgl-benchmark-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") +set_target_properties(mbgl-render-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") set_target_properties(mbgl-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") target_compile_options(example-custom-layer PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) target_compile_options(mapbox-gl PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) target_compile_options(mbgl-core PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) +target_compile_options(mbgl-render-test-runner PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) target_compile_options(mbgl-vendor-icu PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) target_compile_options(mbgl-vendor-sqlite PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>) |