From 72132da690e9c328d5954e83f21c09da2bbf9a6c Mon Sep 17 00:00:00 2001 From: JohnE Date: Thu, 30 Apr 2026 22:42:48 -0700 Subject: [PATCH] FIX: android NDK discovery fixes so rust crates will compile --- cargokit/build_tool/lib/src/android_environment.dart | 6 ++++++ rust/Cargo.lock | 4 ++-- rust/Cargo.toml | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cargokit/build_tool/lib/src/android_environment.dart b/cargokit/build_tool/lib/src/android_environment.dart index 0bf6a47..97d9b45 100644 --- a/cargokit/build_tool/lib/src/android_environment.dart +++ b/cargokit/build_tool/lib/src/android_environment.dart @@ -179,6 +179,12 @@ class AndroidEnvironment { '_CARGOKIT_NDK_LINK_TARGET': targetArg, '_CARGOKIT_NDK_LINK_CLANG': ccValue, 'CARGOKIT_TOOL_TEMP_DIR': toolTempDir, + // Expose the NDK root so that build scripts (e.g. ccc-crypto-wolfssl/build.rs) + // can pass it to cmake as CMAKE_ANDROID_NDK. Without this, cmake's + // Android-Determine.cmake fails with "Neither the NDK or a standalone + // toolchain was found" because cmake is invoked in an isolated env that + // does not inherit ANDROID_NDK_ROOT from the shell. + 'ANDROID_NDK_ROOT': ndkPath, }; } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 603443d..4a580fa 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -181,7 +181,7 @@ dependencies = [ [[package]] name = "ccc-crypto-core" version = "0.1.0" -source = "git+ssh://git@10.0.5.109/j3g/lum_ccc_rust.git?branch=trunk#cbad181ae625cc7cd21afcbe40afdaf865d9b19a" +source = "git+ssh://git@10.0.5.109/j3g/lum_ccc_rust.git?branch=trunk#80e0e65462bebeca0f0fe2e75a236049c8c37293" dependencies = [ "log", "once_cell", @@ -194,7 +194,7 @@ dependencies = [ [[package]] name = "ccc-crypto-wolfssl" version = "0.1.0" -source = "git+ssh://git@10.0.5.109/j3g/lum_ccc_rust.git?branch=trunk#cbad181ae625cc7cd21afcbe40afdaf865d9b19a" +source = "git+ssh://git@10.0.5.109/j3g/lum_ccc_rust.git?branch=trunk#80e0e65462bebeca0f0fe2e75a236049c8c37293" dependencies = [ "argon2", "bindgen", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index dfd02e1..f5e70ab 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,10 +7,16 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] +# Production / CI: resolve from the private git server. +# After pushing changes to lum_ccc_rust run: +# cargo update -p ccc-crypto-core -p ccc-crypto-wolfssl (in this directory) +# then commit the updated Cargo.lock. ccc-crypto-core = { git = "ssh://git@10.0.5.109/j3g/lum_ccc_rust.git", branch = "trunk" } ccc-crypto-wolfssl = { git = "ssh://git@10.0.5.109/j3g/lum_ccc_rust.git", branch = "trunk" } -# For local development, you can uncomment the following lines and comment out the git dependencies above: +# Local development: set CCC_LOCAL_DEV=1 and use `cargo build` directly +# (not through Flutter) to iterate without git fetches or lock-file churn. +# Switch by running: dev-sync.sh --local / --git (see scripts/dev-sync.sh) # ccc-crypto-core = { path = "/Volumes/LUM/source/letusmsg_proj/app/lum_ccc_rust/crates/ccc-crypto-core" } # ccc-crypto-wolfssl = { path = "/Volumes/LUM/source/letusmsg_proj/app/lum_ccc_rust/crates/ccc-crypto-wolfssl" }