tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of mapbox-gl-native-curl (#1102)

Browse Source
This commit is contained in:
Siarhei Fedartsou
2023-05-08 11:41:59 +02:00
committed by GitHub
parent 9a2298d458
commit 083165e8df
5 changed files with 6 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
platform/android/android.cmake
View File

@@ -139,24 +139,11 @@ target_link_libraries(
-Wl,--no-whole-archive
)
if(ANDROID_NATIVE_API_LEVEL VERSION_LESS 24)
target_sources(
mbgl-test-runner
PRIVATE ${PROJECT_SOURCE_DIR}/platform/android/src/test/http_file_source_test_stub.cpp
)
else()
target_sources(
mbgl-test-runner
PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp
)
include(${PROJECT_SOURCE_DIR}/vendor/curl.cmake)
target_link_libraries(
mbgl-test-runner
PRIVATE mbgl-vendor-curl
)
endif()
target_sources(
mbgl-test-runner
PRIVATE ${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
)
add_custom_command(
TARGET mbgl-test-runner PRE_BUILD
@@ -189,7 +176,7 @@ add_library(
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/collator_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/number_format_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/http_file_source_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
)
target_include_directories(
@@ -238,7 +225,7 @@ add_library(
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/collator_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/number_format_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/src/test/http_file_source_test_stub.cpp
${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
)
target_include_directories(

31
platform/android/src/test/http_file_source_test_stub.cpp
View File

@@ -1,31 +0,0 @@
#include <mbgl/storage/http_file_source.hpp>
#include <mbgl/storage/resource.hpp>
#include <mbgl/util/async_request.hpp>
#include <mbgl/util/async_task.hpp>
namespace mbgl {
class HTTPFileSource::Impl {};
HTTPFileSource::HTTPFileSource(const ResourceOptions& /*resourceOptions*/, const ClientOptions& /*clientOptions*/)
: impl(std::make_unique<Impl>()) {}
HTTPFileSource::~HTTPFileSource() = default;
void HTTPFileSource::setResourceOptions(ResourceOptions /*options*/) {}
ResourceOptions HTTPFileSource::getResourceOptions() {
return ResourceOptions::Default();
}
void HTTPFileSource::setClientOptions(ClientOptions /*options*/) {}
ClientOptions HTTPFileSource::getClientOptions() {
return ClientOptions();
}
std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource&, Callback) {
return std::make_unique<AsyncRequest>();
}
} // namespace mbgl