Merge pull request #3728 from vandenoever/android

Some additional android runtimes.
This commit is contained in:
Peter Simons 2014-08-24 11:25:51 +02:00
commit c7e14b4aae

View File

@ -52,6 +52,12 @@ rec {
alsaLib_32bit = pkgs_i686.alsaLib;
};
androidsdk_2_1 = androidsdk {
platformVersions = [ "7" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_2_2 = androidsdk {
platformVersions = [ "8" ];
abiVersions = [ "armeabi-v7a" ];
@ -82,6 +88,12 @@ rec {
useGoogleAPIs = true;
};
androidsdk_4_4 = androidsdk {
platformVersions = [ "19" ];
abiVersions = [ "armeabi-v7a" "x86" ];
useGoogleAPIs = true;
};
androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses;
};