Skip to content

Commit 47eac6c

Browse files
committed
Update .def files for dynamic linking and adjust NDK version in config.toml
- Switched from `staticLibraries` to `linkerOpts` for Android builds across MySQL, PostgreSQL, and SQLite. - Updated Android NDK version in `config.toml` from 35 to 21 for compatibility.
1 parent 2f38801 commit 47eac6c

4 files changed

Lines changed: 10 additions & 11 deletions

File tree

scripts/config.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
# Set this config to your ~/.cargo/config.toml
2+
# Konan uses NDK 21: https://github.com/JetBrains/kotlin/blob/master/kotlin-native/konan/konan.properties
13
[target.aarch64-linux-android]
2-
linker = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android35-clang"
4+
linker = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang"
35
ar = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar"
46

57
[target.x86_64-linux-android]
6-
linker = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android35-clang"
8+
linker = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang"
79
ar = "/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar"
810

911
[target.aarch64-unknown-linux-gnu]
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package = sqlx4k.mysql
22
headers = sqlx4k_mysql.h
33
compilerOpts = -I./src/rust/target
4-
staticLibraries = libsqlx4k_mysql.a
5-
libraryPaths.android_arm64 = ./src/rust/target/aarch64-linux-android/release
6-
libraryPaths.android_x64 = ./src/rust/target/x86_64-linux-android/release
4+
linkerOpts.android_arm64 = ./sqlx4k-mysql/src/rust/target/aarch64-linux-android/release/libsqlx4k_mysql.so
5+
linkerOpts.android_x64 = ./sqlx4k-mysql/src/rust/target/x86_64-linux-android/release/libsqlx4k_mysql.so
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package = sqlx4k.postgresql
22
headers = sqlx4k_postgres.h
33
compilerOpts = -I./src/rust/target
4-
staticLibraries = libsqlx4k_postgres.a
5-
libraryPaths.android_arm64 = ./src/rust/target/aarch64-linux-android/release
6-
libraryPaths.android_x64 = ./src/rust/target/x86_64-linux-android/release
4+
linkerOpts.android_arm64 = ./sqlx4k-postgres/src/rust/target/aarch64-linux-android/release/libsqlx4k_postgres.so
5+
linkerOpts.android_x64 = ./sqlx4k-postgres/src/rust/target/x86_64-linux-android/release/libsqlx4k_postgres.so
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package = sqlx4k.sqlite
22
headers = sqlx4k_sqlite.h
33
compilerOpts = -I./src/rust/target
4-
staticLibraries = libsqlx4k_sqlite.a
5-
libraryPaths.android_arm64 = ./src/rust/target/aarch64-linux-android/release
6-
libraryPaths.android_x64 = ./src/rust/target/x86_64-linux-android/release
4+
linkerOpts.android_arm64 = ./sqlx4k-sqlite/src/rust/target/aarch64-linux-android/release/libsqlx4k_sqlite.so
5+
linkerOpts.android_x64 = ./sqlx4k-sqlite/src/rust/target/x86_64-linux-android/release/libsqlx4k_sqlite.so

0 commit comments

Comments
 (0)