+47
-20
pkgs/development/mobile/androidenv/build-tools.nix
+47
-20
pkgs/development/mobile/androidenv/build-tools.nix
···-{deployAndroidPackage, lib, stdenv, package, os, arch, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall, meta}:-++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc zlib ncurses5 ]);noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
···noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
+16
-2
pkgs/development/mobile/androidenv/cmake.nix
+16
-2
pkgs/development/mobile/androidenv/cmake.nix
···-buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
···
+513
-276
pkgs/development/mobile/androidenv/compose-android-packages.nix
+513
-276
pkgs/development/mobile/androidenv/compose-android-packages.nix
·········-The only available versions are ${builtins.concatStringsSep ", " (builtins.attrNames packages.${package})}.···-hasSrc = package: package.src != null && (builtins.isList package.src -> builtins.length package.src > 0);······-ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type···-deployAndroidPackage = ({package, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:-# Deploy all system images with the same systemImageType in one derivation to avoid the `null` problem below-# $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'-package = makeNdkBundle (allArchives.packages.ndk-bundle.${ndkVersion} or allArchives.packages.ndk.${ndkVersion});) (builtins.filter (platformVersion: lib.versionOlder platformVersion "26") platformVersions); # API level 26 and higher include Google APIs by default···-${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; check = includeNDK; }}-${linkPlatformPlugins { name = "add-ons"; plugins = google-tv-addons; check = useGoogleTVAddOns; }}-find $ANDROID_SDK_ROOT/${cmdline-tools-package.path}/bin -type f -executable | while read i; do
···+if builtins.hasAttr "arch" archive then archive.arch == arch || archive.arch == "all" else true;···+liftedArchives = lib.attrsets.mapAttrsRecursiveCond (value: !(builtins.hasAttr "archives" value)) (······+package: package.src != null && (builtins.isList package.src -> builtins.length package.src > 0);······+ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type···+# Deploy all system images with the same systemImageType in one derivation to avoid the `null` problem below+# $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64') (builtins.filter (platformVersion: lib.versionOlder platformVersion "26") platformVersions); # API level 26 and higher include Google APIs by default···+find $ANDROID_SDK_ROOT/${cmdline-tools-package.path}/bin -type f -executable | while read i; do
+2
-1
pkgs/development/mobile/androidenv/default.nix
+2
-1
pkgs/development/mobile/androidenv/default.nix
+121
-85
pkgs/development/mobile/androidenv/deploy-androidpackages.nix
+121
-85
pkgs/development/mobile/androidenv/deploy-androidpackages.nix
···-extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ];-if hasXmlAttrs && hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues }</${tag}>"···<license id="${package.license}" type="text">${lib.concatStringsSep "---" (mkLicenses package.license)}</license>-# Some executables that have been patched with patchelf may not work any longer after they have been stripped.
······<license id="${package.license}" type="text">${lib.concatStringsSep "---" (mkLicenses package.license)}</license>+# Some executables that have been patched with patchelf may not work any longer after they have been stripped.
+46
-26
pkgs/development/mobile/androidenv/emulator.nix
+46
-26
pkgs/development/mobile/androidenv/emulator.nix
···-{ deployAndroidPackage, lib, stdenv, package, os, arch, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall, meta }:······
·········
+17
-14
pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
+17
-14
pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
···-echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64'
···+echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64'
+116
-80
pkgs/development/mobile/androidenv/examples/shell.nix
+116
-80
pkgs/development/mobile/androidenv/examples/shell.nix
···# This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html············-# FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?!
···# This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html············+# FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?!
+39
-10
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+39
-10
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
···-buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ];# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling···noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
···# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling···noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
+30
-14
pkgs/development/mobile/androidenv/platform-tools.nix
+30
-14
pkgs/development/mobile/androidenv/platform-tools.nix
···-buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ];-find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
···+find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
+49
-10
pkgs/development/mobile/androidenv/tools.nix
+49
-10
pkgs/development/mobile/androidenv/tools.nix
···-{deployAndroidPackage, lib, stdenv, package, os, arch, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall, meta}:-++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])···
······