Commit d3f8c4d4 authored by Hadi's avatar Hadi Committed by Masum Reza
Browse files

androidenv: upgradde to repository2-3 

androidenv: apply numinit patch to have a nice error message

androidenv handle unsupported systems, and make tests running by default!

androidenv run nixfmt

androidenv: support emulator/systemimages/NDK only for certain systems

androidenv: apply nixfmt

androidenv: give a warning if archive doesn't exist
parent 7b0b1bd8

pkgs/development/mobile/androidenv/build-tools.nix

+4 −3
Original line number Diff line number Diff line 
{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}:

{deployAndroidPackage, lib, stdenv, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}:



deployAndroidPackage {

  inherit package os;

  inherit package;

  nativeBuildInputs = [ makeWrapper ]

    ++ lib.optionals (os == "linux") [ autoPatchelfHook ];

  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgsi686Linux.glibc pkgsi686Linux.zlib pkgsi686Linux.ncurses5 pkgs.libcxx ];

  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs.libcxx ]

    ++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc zlib ncurses5 ]);

  patchInstructions = ''

    ${lib.optionalString (os == "linux") ''

      addAutoPatchelfSearchPath $packageBaseDir/lib

pkgs/development/mobile/androidenv/cmake.nix

+1 −1
Original line number Diff line number Diff line 
{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}:



deployAndroidPackage {

  inherit package os;

  inherit package;

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

  buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];

  patchInstructions = lib.optionalString (os == "linux") ''

pkgs/development/mobile/androidenv/compose-android-packages.nix

+35 −16
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, platformToolsVersion ? "35.0.2"

, buildToolsVersions ? [ "35.0.0" ]

, includeEmulator ? false

, emulatorVersion ? "35.3.10"

, emulatorVersion ? "35.5.2"

, platformVersions ? []

, includeSources ? false

, includeSystemImages ? false
@@ -27,9 +27,20 @@ 


let

  # Determine the Android os identifier from Nix's system identifier

  os = if stdenv.hostPlatform.isLinux then "linux"

    else if stdenv.hostPlatform.isDarwin then "macosx"

    else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";

  os = {

      x86_64-linux = "linux";

      x86_64-darwin = "macosx";

      aarch64-linux = "linux";

      aarch64-darwin = "macosx";

  }.${stdenv.hostPlatform.system} or "all";



  # Determine the Android arch identifier from Nix's system identifier

  arch = {

      x86_64-linux = "x64";

      x86_64-darwin = "x64";

      aarch64-linux = "aarch64";

      aarch64-darwin = "aarch64";

  }.${stdenv.hostPlatform.system} or "all";



  # Uses mkrepo.rb to create a repo spec.

  mkRepoJson = { packages ? [], images ? [], addons ? [] }: let
@@ -71,9 +82,23 @@ let 
    lib.attrsets.mapAttrsRecursive

      (path: value:

        if (builtins.elemAt path ((builtins.length path) - 1)) == "archives" then

          (builtins.listToAttrs

            (builtins.map

              (archive: lib.attrsets.nameValuePair archive.os (fetchurl { inherit (archive) url sha1; })) value))

          let

            validArchives = builtins.filter (archive:

              let

                isTargetOs = if builtins.hasAttr "os" archive then

                  archive.os == os || archive.os == "all" else true;

                isTargetArc = if builtins.hasAttr "arch" archive then

                  archive.arch == arch || archive.arch == "all" else true;

              in

                isTargetOs && isTargetArc

            ) value;

          in

          lib.warnIf (builtins.length validArchives == 0)

            "No valid archives for ${lib.concatMapStringsSep "." (x: ''"${x}"'') path} for os=${os}, arch=${arch}"

            (lib.optionals (builtins.length validArchives > 0)

              (lib.last (map (archive:

                (fetchurl { inherit (archive) url sha1; })

              ) validArchives)))

        else value

      )

      attrSet;
@@ -117,12 +142,12 @@ rec { 
    inherit stdenv lib mkLicenses;

  };



  deployAndroidPackage = ({package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:

  deployAndroidPackage = ({package, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:

    let

      extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ];

    in

    deployAndroidPackages ({

      inherit os buildInputs meta;

      inherit buildInputs;

      packages = [ package ];

      patchesInstructions = { "${package.name}" = patchInstructions; };

    } // extraParams
@@ -139,8 +164,7 @@ rec { 
      '';



  platform-tools = callPackage ./platform-tools.nix {

    inherit deployAndroidPackage;

    os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here

    inherit deployAndroidPackage os;

    package = check-version packages "platform-tools" platformToolsVersion;

  };
@@ -176,14 +200,12 @@ rec { 


  platforms = map (version:

    deployAndroidPackage {

      inherit os;

      package = check-version packages "platforms" version;

    }

  ) platformVersions;



  sources = map (version:

    deployAndroidPackage {

      inherit os;

      package = check-version packages "sources" version;

    }

  ) platformVersions;
@@ -218,7 +240,6 @@ rec { 
      in

      lib.optionals (availablePackages != [])

        (deployAndroidPackages {

          inherit os;

          packages = availablePackages;

          patchesInstructions = instructions;

        })
@@ -247,14 +268,12 @@ rec { 


  google-apis = map (version:

    deployAndroidPackage {

      inherit os;

      package = (check-version addons "addons" version).google_apis;

    }

  ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default



  google-tv-addons = map (version:

    deployAndroidPackage {

      inherit os;

      package = (check-version addons "addons" version).google_tv_addon;

    }

  ) platformVersions;

pkgs/development/mobile/androidenv/default.nix

+9 −3
Original line number Diff line number Diff line
@@ -29,9 +29,15 @@ rec { 
      "34"

      "35"

    ];

    includeEmulator = true;

    includeSystemImages = true;

    includeNDK = true;

    includeEmulator =

      with pkgs.stdenv.hostPlatform;

      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";

    includeSystemImages =

      with pkgs.stdenv.hostPlatform;

      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";

    includeNDK =

      with pkgs.stdenv.hostPlatform;

      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";

  };



  test-suite = pkgs.callPackage ./test-suite.nix { };

pkgs/development/mobile/androidenv/deploy-androidpackages.nix

+2 −4
Original line number Diff line number Diff line 
{stdenv, lib, unzip, mkLicenses}:

{packages, os ? null, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args:

{packages, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args:



let

  extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ];
@@ -62,9 +62,7 @@ stdenv.mkDerivation ({ 
  inherit buildInputs;

  pname = "android-sdk-${lib.concatMapStringsSep "-" (package: package.name) sortedPackages}";

  version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages;

  src = map (package:

    if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all

  ) packages;

  src = map (package: package.archives) packages;

  nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;

  preferLocalBuild = true;