chore(android): update libname

NativeScript · Jan 4, 2024 · 7aec52f · 7aec52f
1 parent 1034958
commit 7aec52f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt b/...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt
@@ -625,7 +625,7 @@ class NSCCanvas : FrameLayout {
 		@JvmStatic
 		fun loadLib() {
 			if (!isLibraryLoaded) {
-				System.loadLibrary("canvasandroid")
+				System.loadLibrary("canvasnative")
 				System.loadLibrary("canvasnativev8")
 				isLibraryLoaded = true
 			}

diff --git a/packages/canvas/src-native/canvas-native/canvas-android/CMakeLists.txt b/packages/canvas/src-native/canvas-native/canvas-android/CMakeLists.txt
@@ -11,7 +11,7 @@ if (ENABLE_LTO)
     set(RUST_FLAGS "-Clinker-plugin-lto" "-Clinker=clang-14" "-Clink-arg=-fuse-ld=lld-14")
 endif ()
 
-set(CANVAS_CORE_LIB ${PROJECT_NATIVE_ROOT_DIR}/target/${TARGET_DIR}/libcanvasandroid.a)
+set(CANVAS_CORE_LIB ${PROJECT_NATIVE_ROOT_DIR}/target/${TARGET_DIR}/libcanvasnative.a)
 
 #set(CANVAS_CXX ${CMAKE_CURRENT_BINARY_DIR}/canvas)
 #set(CANVAS_CXX_HEADER ${CMAKE_CURRENT_BINARY_DIR}/canvas_core.h)

diff --git a/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml
@@ -7,10 +7,9 @@ edition = "2021"
 rustflags = ["-Cpanic=abort", "-C target-cpu=native", "-C target-feature=-outline-atomics"]
 
 [lib]
-name = "canvasandroid"
+name = "canvasnative"
 crate-type = ["cdylib"]
 
-
 [dependencies]
 canvas-core = { path = "../canvas-core", features = ["2d"] }
 canvas-2d = { path = "../canvas-2d", features = ["gl"] }
@@ -28,4 +27,4 @@ libloading = "0.8.1"
 log = "0.4.20"
 android_logger = "0.13.1"
 skia-safe = { version = "0.69.0" }
-itertools = "0.12.0"
+itertools = "0.12.0"