build: support Nix host CMake and Ninja for Android native libraries

This commit is contained in:
Blendman974 committed 2026-11-06 00:25:36 +01:00
1 parent e1e48ec038
commit e915608b1a
3 files changed
+18 -2

No files matched your search

+8
View File
@@ -162,6 +162,14 @@ tasks.register("prepareFaceclawNativeLibs") {
def faceclawLlamaCppTag = "b10333"
def faceclawFindSdkCmakeDir = {
// NixOS and other managed environments can provide patched host tools.
def explicitCmake = System.getenv("ANDROID_CMAKE_HOME")
if (explicitCmake != null) {
def explicitDir = file(explicitCmake)
if (faceclawHostExecutable(file("$explicitDir/bin"), "cmake").exists()
&& faceclawHostExecutable(file("$explicitDir/bin"), "ninja").exists()) return explicitDir
throw new GradleException("ANDROID_CMAKE_HOME must contain bin/cmake and bin/ninja: $explicitDir")
}
def sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
if (sdkRoot == null) return null
def cmakeRoot = file("$sdkRoot/cmake")
+7 -1
View File
@@ -15,7 +15,7 @@
buildTools.version = [ "35.0.0" "35.0.1" ];
ndk.enable = true;
ndk.version = [ "27.2.12479018" ];
cmake.version = [ "3.22.1" ];
cmake.version = [ ];
emulator.enable = false;
systemImages.enable = false;
sources.enable = false;
@@ -26,6 +26,10 @@
# NativeScript's doctor rejects a valid build-only SDK without an emulator.
# enterTest below checks the actual tools used by our local builds.
env.NS_SKIP_ENV_CHECK = "1";
env.ANDROID_CMAKE_HOME = "${pkgs.symlinkJoin {
name = "faceclaw-cmake";
paths = [ pkgs.cmake pkgs.ninja ];
}}";
scripts.faceclaw-setup.exec = "npm ci";
scripts.faceclaw-test.exec = "npm test";
enterShell = ''
@@ -37,5 +41,7 @@
test -f "$ANDROID_HOME/platforms/android-35/android.jar"
test -x "$ANDROID_HOME/build-tools/35.0.0/aapt2"
test -x "$ANDROID_HOME/platform-tools/adb"
"$ANDROID_CMAKE_HOME/bin/cmake" --version
"$ANDROID_CMAKE_HOME/bin/ninja" --version
'';
}
+3 -1
View File
@@ -6,7 +6,9 @@ The committed `devenv.lock` pins the environment inputs.
The environment provides Node 22/npm, Java 21, Android SDK/platform 35,
build-tools 35.0.0/35.0.1 (app and NativeScript plugins), NDK 27, CMake,
Git/GitHub CLI, Python and build utilities.
Git/GitHub CLI, Python and build utilities. `ANDROID_CMAKE_HOME` selects the
Nix-patched CMake/Ninja pair for the native Android libraries (the SDK's bundled
Ninja can crash on NixOS). Other environments keep using the SDK's CMake.
Android SDK licenses are accepted through `devenv.yaml`. Gradle uses the
Nix-patched SDK aapt2. Gradle itself comes from the repository's wrapper.
The emulator and system images are omitted. `NS_SKIP_ENV_CHECK=1` bypasses