diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index af6d823fe..d1f01e165 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -106,7 +106,7 @@ jobs: - name: Run Android unit tests run: make run-android-unit-test - - name: Build libmapbox-gl.so for arm-v8 + - name: Build libmaplibre.so for arm-v8 run: make android-lib-arm-v8 - name: Copy developer config with API key for UI tests diff --git a/platform/android/Makefile b/platform/android/Makefile index 5d180cf40..03a3acbe9 100644 --- a/platform/android/Makefile +++ b/platform/android/Makefile @@ -90,7 +90,7 @@ run-android-core-test-$1-%: android-core-test-$1 # Push all needed files to the device adb push $(MLN_ANDROID_CORE_TEST_DIR)/classes.dex $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmapbox-gl.so $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 + adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 adb push test/fixtures $(MLN_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 adb push scripts/style-spec-reference/v8.json $(MLN_ANDROID_LOCAL_WORK_DIR)/scripts/style-spec-reference > /dev/null 2>&1 adb push MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 @@ -124,7 +124,7 @@ run-android-benchmark-$1-%: android-benchmark-$1 # Push compiled java sources, test data and executable to device adb push $(MLN_ANDROID_BENCHMARK_DIR)/classes.dex $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmapbox-gl.so $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 + adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 adb push benchmark/fixtures $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/benchmark > /dev/null 2>&1 adb push test/fixtures $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/test > /dev/null 2>&1 adb push MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-benchmark $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 4904f8ace..b3d1c052d 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -87,7 +87,7 @@ android { } // build native libraries - List nativeTargets = ["mapbox-gl"] + List nativeTargets = ["maplibre"] if (project.hasProperty("mapbox.with_test")) { nativeTargets.add("mbgl-test") } diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt b/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt index e562fa065..f616d34bd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt +++ b/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt @@ -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 $<$:-Oz> $<$:-Qunused-arguments> $<$:-flto> $<$:-fvisibility=hidden> $<$:-fvisibility-inlines-hidden>) -target_link_libraries(mapbox-gl +target_link_libraries(maplibre PRIVATE $<$:-Oz> $<$:-Wl,--icf=all> $<$:-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) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java b/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java index cc6fdfb60..173f58c70 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java @@ -31,7 +31,7 @@ public abstract class LibraryLoader { } /** - * Loads "libmapbox-gl.so" native shared library. + * Loads "libmaplibre.so" native shared library. *

* Catches UnsatisfiedLinkErrors and prints a warning to logcat. *

@@ -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; diff --git a/platform/android/scripts/metrics.sh b/platform/android/scripts/metrics.sh index 99f8bb433..01efaf4eb 100755 --- a/platform/android/scripts/metrics.sh +++ b/platform/android/scripts/metrics.sh @@ -4,10 +4,10 @@ set -e set -o pipefail # Track individual architectures -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libmapbox-gl.so" "Android arm-v7" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libmapbox-gl.so" "Android arm-v8" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86/libmapbox-gl.so" "Android x86" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86_64/libmapbox-gl.so" "Android x86_64" +scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libmaplibre.so" "Android arm-v7" +scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libmaplibre.so" "Android arm-v8" +scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86/libmaplibre.so" "Android x86" +scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86_64/libmaplibre.so" "Android x86_64" # Track overall library size scripts/check_binary_size.js "MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar" "Android AAR"