android-platform-tools: 23.0.1 -> 24, etc.
- `adb` is now 64 bit. Linking against 64 bit libraries. - Added `.lib` or `.out` postfix for 32 bit library packages. - Some libraries are reside in `lib64` instead of `lib`. - Other version bumps.
This commit is contained in:
@@ -2,9 +2,7 @@
|
||||
|
||||
rec {
|
||||
platformTools = import ./platform-tools.nix {
|
||||
inherit (pkgs) stdenv fetchurl unzip;
|
||||
stdenv_32bit = pkgs_i686.stdenv;
|
||||
zlib_32bit = pkgs_i686.zlib;
|
||||
inherit (pkgs) stdenv fetchurl unzip zlib;
|
||||
};
|
||||
|
||||
buildTools = import ./build-tools.nix {
|
||||
@@ -172,6 +170,20 @@ rec {
|
||||
useGooglePlayServices = true;
|
||||
};
|
||||
|
||||
androidsdk_7_0 = androidsdk {
|
||||
platformVersions = [ "24" ];
|
||||
abiVersions = [ "x86" "x86_64"];
|
||||
useGoogleAPIs = true;
|
||||
};
|
||||
|
||||
androidsdk_7_0_extras = androidsdk {
|
||||
platformVersions = [ "24" ];
|
||||
abiVersions = [ "x86" "x86_64"];
|
||||
useGoogleAPIs = true;
|
||||
useExtraSupportLibs = true;
|
||||
useGooglePlayServices = true;
|
||||
};
|
||||
|
||||
androidndk = import ./androidndk.nix {
|
||||
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
|
||||
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
|
||||
|
||||
Reference in New Issue
Block a user