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

Android - Renaming the library generated .so files (#2201)

Browse Source
This commit is contained in:
Julien Corazza
2024-03-27 12:27:47 +01:00
committed by GitHub
parent a79f984a58
commit 7599611fe2
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
target_compile_options(mbgl-compiler-options INTERFACE -frtti)
add_library(mapbox-gl SHARED
add_library(maplibre SHARED
${PROJECT_SOURCE_DIR}/main.cpp
${PROJECT_SOURCE_DIR}/jni_native.cpp
${PROJECT_SOURCE_DIR}/jni_native.hpp
@@ -193,20 +193,20 @@ add_library(mapbox-gl SHARED
${PROJECT_SOURCE_DIR}/util/tile_server_options.hpp)
target_include_directories(
mapbox-gl
maplibre
PRIVATE ${PROJECT_SOURCE_DIR}
../../../../../src
../../../src
../../../../default/include)
target_compile_options(mapbox-gl
target_compile_options(maplibre
PRIVATE $<$<CONFIG:Release>:-Oz>
$<$<CONFIG:Release>:-Qunused-arguments>
$<$<CONFIG:Release>:-flto>
$<$<CONFIG:Release>:-fvisibility=hidden>
$<$<CONFIG:Release>:-fvisibility-inlines-hidden>)
target_link_libraries(mapbox-gl
target_link_libraries(maplibre
PRIVATE $<$<CONFIG:Release>:-Oz>
$<$<CONFIG:Release>:-Wl,--icf=all>
$<$<CONFIG:Release>:-Wl,--gc-sections>
@@ -216,4 +216,4 @@ target_link_libraries(mapbox-gl
mbgl-core
mbgl-vendor-unique_resource)
install(TARGETS mapbox-gl LIBRARY DESTINATION lib)
install(TARGETS maplibre LIBRARY DESTINATION lib)

4
platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java
View File

@@ -31,7 +31,7 @@ public abstract class LibraryLoader {
}
/**
* Loads "libmapbox-gl.so" native shared library.
* Loads "libmaplibre.so" native shared library.
* <p>
* Catches UnsatisfiedLinkErrors and prints a warning to logcat.
* </p>
@@ -40,7 +40,7 @@ public abstract class LibraryLoader {
try {
if (!loaded) {
loaded = true;
loader.load("mapbox-gl");
loader.load("maplibre");
}
} catch (UnsatisfiedLinkError error) {
loaded = false;