From 60bb6c72d1a84b534dc1970d5c9acf66cc1e4348 Mon Sep 17 00:00:00 2001 From: Duncan Tourolle Date: Sun, 21 Jun 2026 09:22:34 +0200 Subject: [PATCH] ci: stop committing machine-specific Android cargo config src-tauri/.cargo/config.toml hardcoded absolute NDK paths under /home/dtourolle, which only exist on the dev laptop. In CI this made ring's build script fail to find aarch64-linux-android34-clang. Tauri derives the linker/CC paths from NDK_HOME automatically during 'android build', so the file is unnecessary there. Untrack it and gitignore it; local dev copies are preserved on disk. --- .gitignore | 3 +++ src-tauri/.cargo/config.toml | 38 ------------------------------------ 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 src-tauri/.cargo/config.toml diff --git a/.gitignore b/.gitignore index 30d5672..8560f45 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ logs # Android signing keystore (NEVER commit) android-keystore/ + +# Local machine-specific Android NDK toolchain paths (do not commit) +src-tauri/.cargo/config.toml diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml deleted file mode 100644 index 6d5d7d2..0000000 --- a/src-tauri/.cargo/config.toml +++ /dev/null @@ -1,38 +0,0 @@ -[target.aarch64-linux-android] -linker = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android34-clang" -ar = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -[target.armv7-linux-androideabi] -linker = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi34-clang" -ar = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -[target.i686-linux-android] -linker = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android34-clang" -ar = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -[target.x86_64-linux-android] -linker = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android34-clang" -ar = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -[env] -# Point to the NDK for the cc crate and other build scripts -ANDROID_NDK_HOME = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006" -NDK_HOME = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006" - -# Set CC/CXX for each Android target (cc crate looks for these) -CC_aarch64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android34-clang" -CXX_aarch64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android34-clang++" -AR_aarch64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -CC_armv7-linux-androideabi = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi34-clang" -CXX_armv7-linux-androideabi = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi34-clang++" -AR_armv7-linux-androideabi = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -CC_i686-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android34-clang" -CXX_i686-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android34-clang++" -AR_i686-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" - -CC_x86_64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android34-clang" -CXX_x86_64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android34-clang++" -AR_x86_64-linux-android = "/home/dtourolle/Android/Sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" -