From 4a0ae5d7d69232ced9f47af783d1413c8bd991e5 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Fri, 26 Oct 2018 09:48:25 -0700 Subject: [PATCH] androidenv: add androidsdk_{8_1,9_0}{,_extras} --- .../development/mobile/androidenv/default.nix | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 0291986b5a4a..25ccb6ee6ed0 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -222,7 +222,37 @@ rec { useInstantApps = true; }; - androidsdk_latest = androidsdk_8_0; + androidsdk_8_1 = androidsdk { + platformVersions = [ "27" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_8_1_extras = androidsdk { + platformVersions = [ "27" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + useInstantApps = true; + }; + + androidsdk_9_0 = androidsdk { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_9_0_extras = androidsdk { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + useInstantApps = true; + }; + + androidsdk_latest = androidsdk_9_0; androidndk_10e = pkgs.callPackage ./androidndk.nix { inherit (buildPackages)