diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2020-01-23 14:24:09 +0200 |
|---|---|---|
| committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-02-06 13:38:10 +0200 |
| commit | ad4002c17b3e53f48b4e91e57cad94b6c962bac4 (patch) | |
| tree | fc27534d2ddf1bbca0e6751b705e7e28e7629afa /next/platform/android/android.cmake | |
| parent | fe05c01c5efe9e68632c878d048adaa698135b5a (diff) | |
| download | qtlocation-mapboxgl-ad4002c17b3e53f48b4e91e57cad94b6c962bac4.tar.gz | |
[test] Enable HTTP server on Androidupstream/jmalanen-android-curl
Diffstat (limited to 'next/platform/android/android.cmake')
| -rw-r--r-- | next/platform/android/android.cmake | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 454e11bcd2..1f77d0a29a 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -329,7 +329,6 @@ add_library( ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.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/android/src/test/http_file_source_test_stub.cpp ) target_include_directories( @@ -347,6 +346,29 @@ target_link_libraries( -Wl,--no-whole-archive ) +if(ANDROID_NATIVE_API_LEVEL VERSION_LESS 24) + target_sources( + mbgl-test-runner + PRIVATE ${MBGL_ROOT}/platform/android/src/test/http_file_source_test_stub.cpp + ) +else() + set(CURL_DIR ${MBGL_ROOT}/vendor/curl-android-ios/prebuilt-with-ssl/android) + set(CURL_LIBRARY ${CURL_DIR}/${ANDROID_ABI}/libcurl.a) + + target_sources( + mbgl-test-runner + PRIVATE ${MBGL_ROOT}/platform/default/src/mbgl/storage/http_file_source.cpp + ) + target_include_directories( + mbgl-test-runner + PRIVATE ${CURL_DIR}/include + ) + target_link_libraries( + mbgl-test-runner + PRIVATE ${CURL_LIBRARY} + ) +endif() + add_custom_command( TARGET mbgl-test-runner PRE_BUILD COMMAND |