android-dev archetype: ship the Android SDK and nix-ld so a Gradle build runs
The archetype installed Gradle, a JDK and android-tools but no SDK, no ANDROID_HOME/JAVA_HOME and no nix-ld, so the aapt2 Gradle downloads could not start on NixOS and an agent could not build an app. It now builds an SDK (build-tools 36.1.0, platform 35, no emulator or system images), sets ANDROID_HOME, ANDROID_SDK_ROOT and JAVA_HOME, and enables programs.nix-ld. The SDK's unfree names are read off the SDK and added to allowUnfreePackages, which adds to the claude-code allowance instead of replacing it. Closes #6696
This commit is contained in:
parent
0e147618d0
commit
c9204ad0e0
1 changed files with 134 additions and 5 deletions
|
|
@ -296,6 +296,11 @@ in
|
|||
inherit (pkgs) lib;
|
||||
shared = moduleEvalShared;
|
||||
};
|
||||
module-eval-agent-android-dev = import ./module-eval/agent-android-dev.nix {
|
||||
inherit pkgs self nixosSystem;
|
||||
inherit (pkgs) lib;
|
||||
shared = moduleEvalShared;
|
||||
};
|
||||
|
||||
# Builds `mkServiceImage` around `hello` and reads the tarball back, so the
|
||||
# function is tested without compiling a hyperhive binary. The two `grep -q`
|
||||
|
|
|
|||
Loading…
Reference in a new issue