Merge pull request #3728 from vandenoever/android
Some additional android runtimes.
This commit is contained in:
commit
c7e14b4aae
|
@ -52,6 +52,12 @@ rec {
|
||||||
alsaLib_32bit = pkgs_i686.alsaLib;
|
alsaLib_32bit = pkgs_i686.alsaLib;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
androidsdk_2_1 = androidsdk {
|
||||||
|
platformVersions = [ "7" ];
|
||||||
|
abiVersions = [ "armeabi-v7a" ];
|
||||||
|
useGoogleAPIs = true;
|
||||||
|
};
|
||||||
|
|
||||||
androidsdk_2_2 = androidsdk {
|
androidsdk_2_2 = androidsdk {
|
||||||
platformVersions = [ "8" ];
|
platformVersions = [ "8" ];
|
||||||
abiVersions = [ "armeabi-v7a" ];
|
abiVersions = [ "armeabi-v7a" ];
|
||||||
|
@ -82,6 +88,12 @@ rec {
|
||||||
useGoogleAPIs = true;
|
useGoogleAPIs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
androidsdk_4_4 = androidsdk {
|
||||||
|
platformVersions = [ "19" ];
|
||||||
|
abiVersions = [ "armeabi-v7a" "x86" ];
|
||||||
|
useGoogleAPIs = true;
|
||||||
|
};
|
||||||
|
|
||||||
androidndk = import ./androidndk.nix {
|
androidndk = import ./androidndk.nix {
|
||||||
inherit (pkgs) stdenv fetchurl zlib ncurses;
|
inherit (pkgs) stdenv fetchurl zlib ncurses;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue