diff options
author | zmiao <miao.zhao@mapbox.com> | 2019-10-22 16:32:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-22 16:32:21 +0300 |
commit | 068befa9df1c55904ec7e26bee062e5e33aecbce (patch) | |
tree | b805b79750e0986fb2821fed1c0bd1c5d8cc5b18 /next | |
parent | 2cdc09dbb13964ffd2af1e8776a56c70f80e0360 (diff) | |
download | qtlocation-mapboxgl-068befa9df1c55904ec7e26bee062e5e33aecbce.tar.gz |
[test-runner] Run render test runner as a NativeActivity app on android device (#15827)
* [test-runner]Add android render-test-runner NativeActivity app
* [test-runner] Fix cmake for CI build failure
* [test-runner] Update folder location, change app configureation
* [test-runner] Add running instruction
Diffstat (limited to 'next')
-rw-r--r-- | next/benchmark/CMakeLists.txt | 6 | ||||
-rw-r--r-- | next/platform/android/android.cmake | 68 | ||||
-rw-r--r-- | next/render-test/CMakeLists.txt | 6 | ||||
-rw-r--r-- | next/test/CMakeLists.txt | 1 |
4 files changed, 65 insertions, 16 deletions
diff --git a/next/benchmark/CMakeLists.txt b/next/benchmark/CMakeLists.txt index 2ae1227d91..117d556041 100644 --- a/next/benchmark/CMakeLists.txt +++ b/next/benchmark/CMakeLists.txt @@ -31,7 +31,11 @@ get_target_property(MBGL_CORE_PRIVATE_LIBRARIES mbgl-core LINK_LIBRARIES) target_link_libraries( mbgl-benchmark - PRIVATE ${MBGL_CORE_PRIVATE_LIBRARIES} mbgl-core mbgl-vendor-benchmark + PRIVATE + ${MBGL_CORE_PRIVATE_LIBRARIES} + mbgl-vendor-benchmark + mbgl-core + $<$<PLATFORM_ID:Android>:mbgl-core-android> ) if(CMAKE_SYSTEM_NAME STREQUAL Android) diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 6032294ff7..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 @@ -85,10 +83,6 @@ target_sources( ${MBGL_ROOT}/platform/android/src/gson/json_primitive.cpp ${MBGL_ROOT}/platform/android/src/gson/json_primitive.hpp ${MBGL_ROOT}/platform/android/src/http_file_source.cpp - ${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/image.cpp ${MBGL_ROOT}/platform/android/src/java/util.cpp ${MBGL_ROOT}/platform/android/src/java/util.hpp @@ -98,9 +92,6 @@ 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 @@ -193,8 +184,6 @@ 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/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/default/src/mbgl/gfx/headless_backend.cpp @@ -244,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( @@ -296,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>) diff --git a/next/render-test/CMakeLists.txt b/next/render-test/CMakeLists.txt index b3aa20ba62..02ee6141cf 100644 --- a/next/render-test/CMakeLists.txt +++ b/next/render-test/CMakeLists.txt @@ -1,5 +1,5 @@ add_library( - mbgl-render-test SHARED EXCLUDE_FROM_ALL + mbgl-render-test STATIC EXCLUDE_FROM_ALL ${MBGL_ROOT}/expression-test/test_runner_common.cpp ${MBGL_ROOT}/expression-test/test_runner_common.hpp ${MBGL_ROOT}/render-test/allocation_index.cpp @@ -24,7 +24,7 @@ target_compile_definitions( # FIXME: Should not use core private interface target_include_directories( mbgl-render-test - PRIVATE ${MBGL_ROOT}/src + PRIVATE ${MBGL_ROOT}/src ${MBGL_ROOT}/platform/default/include ) target_include_directories( @@ -40,8 +40,8 @@ target_link_libraries( Mapbox::Base::Extras::args Mapbox::Base::Extras::filesystem Mapbox::Base::pixelmatch-cpp - mbgl-core mbgl-vendor-boost + PUBLIC mbgl-core ) if(CMAKE_SYSTEM_NAME STREQUAL Android) diff --git a/next/test/CMakeLists.txt b/next/test/CMakeLists.txt index 586e2bbdaa..4995fa4e56 100644 --- a/next/test/CMakeLists.txt +++ b/next/test/CMakeLists.txt @@ -153,6 +153,7 @@ target_link_libraries( Mapbox::Base::Extras::args Mapbox::Base::pixelmatch-cpp mbgl-core + $<$<PLATFORM_ID:Android>:mbgl-core-android> ) target_link_libraries( |