summaryrefslogtreecommitdiff
path: root/next
diff options
context:
space:
mode:
authorJuha Alanen <juha.alanen@mapbox.com>2019-12-19 15:26:18 +0200
committerJuha Alanen <juha.alanen@mapbox.com>2020-01-03 11:52:50 +0200
commit5e7e2d23e7a75a08d65ca670591594f4c7be2138 (patch)
tree55ddd1d8a2548560cfd2d2340920b9e3f020bc38 /next
parent8ce3f6a987356713e497004a00242350425f5581 (diff)
downloadqtlocation-mapboxgl-5e7e2d23e7a75a08d65ca670591594f4c7be2138.tar.gz
[android] Share common code between test runners
Diffstat (limited to 'next')
-rw-r--r--next/platform/android/android.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 89eddaaae6..920c472ffd 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -338,9 +338,10 @@ add_library(
mbgl-benchmark-runner SHARED
${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
${MBGL_ROOT}/platform/android/src/test/benchmark_runner.cpp
+ ${MBGL_ROOT}/platform/android/src/test/test_runner_common.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
+ ${MBGL_ROOT}/platform/android/src/test/collator_test_stub.cpp
+ ${MBGL_ROOT}/platform/android/src/test/number_format_test_stub.cpp
${MBGL_ROOT}/platform/default/src/mbgl/storage/file_source.cpp
${MBGL_ROOT}/platform/default/src/mbgl/storage/default_file_source.cpp
)
@@ -393,9 +394,10 @@ 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/android/src/test/test_runner_common.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
+ ${MBGL_ROOT}/platform/android/src/test/collator_test_stub.cpp
+ ${MBGL_ROOT}/platform/android/src/test/number_format_test_stub.cpp
)
target_include_directories(