Commit 0aded46f authored by Jari Vetoniemi's avatar Jari Vetoniemi
Browse files

androidenv: update packages

parent 5f1923d6

pkgs/development/androidndk-pkgs/default.nix

+60 −0
Original line number Diff line number Diff line
@@ -62,4 +62,64 @@ 
      targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;

    };



  "23b" =

    let

      ndkVersion = "23.1.7779620";



      buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {

        includeNDK = true;

        inherit ndkVersion;

      };



      androidComposition = androidenv.composeAndroidPackages {

        includeNDK = true;

        inherit ndkVersion;

      };

    in

    import ./androidndk-pkgs.nix {

      inherit lib;

      inherit (buildPackages)

        makeWrapper python autoPatchelfHook;

      inherit (pkgs)

        stdenv

        runCommand wrapBintoolsWith wrapCCWith;

      # buildPackages.foo rather than buildPackages.buildPackages.foo would work,

      # but for splicing messing up on infinite recursion for the variants we

      # *dont't* use. Using this workaround, but also making a test to ensure

      # these two really are the same.

      buildAndroidndk = buildAndroidComposition.ndk-bundle;

      androidndk = androidComposition.ndk-bundle;

      targetAndroidndkPkgs = targetPackages.androidndkPkgs_23b;

    };



  "24" =

    let

      ndkVersion = "24.0.8215888";



      buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {

        includeNDK = true;

        inherit ndkVersion;

      };



      androidComposition = androidenv.composeAndroidPackages {

        includeNDK = true;

        inherit ndkVersion;

      };

    in

    import ./androidndk-pkgs.nix {

      inherit lib;

      inherit (buildPackages)

        makeWrapper python autoPatchelfHook;

      inherit (pkgs)

        stdenv

        runCommand wrapBintoolsWith wrapCCWith;

      # buildPackages.foo rather than buildPackages.buildPackages.foo would work,

      # but for splicing messing up on infinite recursion for the variants we

      # *dont't* use. Using this workaround, but also making a test to ensure

      # these two really are the same.

      buildAndroidndk = buildAndroidComposition.ndk-bundle;

      androidndk = androidComposition.ndk-bundle;

      targetAndroidndkPkgs = targetPackages.androidndkPkgs_24;

    };



}

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

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
}:



{ toolsVersion ? "26.1.1"

, platformToolsVersion ? "33.0.1"

, platformToolsVersion ? "33.0.2"

, buildToolsVersions ? [ "32.0.0" ]

, includeEmulator ? false

, emulatorVersion ? "31.3.7"
@@ -11,7 +11,7 @@ 
, includeSources ? false

, includeSystemImages ? false

, systemImageTypes ? [ "google_apis_playstore" ]

, abiVersions ? [ "armeabi-v7a" ]

, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]

, cmakeVersions ? [ ]

, includeNDK ? false

, ndkVersion ? "24.0.8215888"
@@ -181,7 +181,7 @@ rec { 
  makeNdkBundle = ndkVersion:

    import ./ndk-bundle {

      inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv;

      package = packages.ndk-bundle.${ndkVersion};

      package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion};

    };



  # All NDK bundles.

pkgs/development/mobile/androidenv/repo.json

+326 −72

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -2659,6 +2659,8 @@ with pkgs; 
  androidndkPkgs = androidndkPkgs_18b;

  androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b";

  androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";

  androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";

  androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";















  androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;